From d63d4ee19e32596085dcb932d3aeb91bae6f1207 Mon Sep 17 00:00:00 2001
From: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Fri, 20 Jul 2012 18:21:59 +0000
Subject: [PATCH] Fixed merge

Monotone-Parent: a7a764a2e6fd01790136451d2f144d9b934d1e8e
Monotone-Revision: 631e9fa8454aae26e4c7eaa71bfe9e18c0f4b7e5

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-07-20T18:21:59
---
 ChangeLog | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cb3021d12..d23960f0c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,9 @@
-<<<<<<< variant A
 2012-07-20  Ludovic Marcotte  <lmarcotte@inverse.ca>
 
 	* UI/MailPartViewers/UIxMailRenderingContext.m
 	(_shouldDisplayAsAttachment:): refactored to consider
 	the "bodyId" parameter only for non text/* parts.
 
->>>>>>> variant B
 2012-07-20  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* SoObjects/Appointments/SOGoAppointmentFolder.m
@@ -13,8 +11,6 @@
 	return immediately if the occurrence does not have a valid
 	recurrence-id.
 
-####### Ancestor
-======= end
 2012-07-20  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* UI/WebServerResources/MailerUI.js (onEmailTo): append the email