From 7d56370ae1d3f9f02da93bdbeee9a1d0d965c1b9 Mon Sep 17 00:00:00 2001
From: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Tue, 14 Sep 2010 21:37:10 +0000
Subject: [PATCH] merged

Monotone-Parent: 8a33d1f9394c9fbaada3fcd1f51d3ba2fb6de40e
Monotone-Revision: 4371482c9c25a9757f941f8b27520cda720cea01

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2010-09-14T21:37:10
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b89cc14d3..5f84b3f4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,3 @@
-<<<<<<< variant A
 2010-09-14  Ludovic Marcotte  <lmarcotte@inverse.ca>
 
 	* SoObjects/Appointments/SOGoUserFolder+Appointments.m
@@ -6,7 +5,6 @@
 	the schedule-inbox-URL if the CAL is iCal and
 	the owner isn't the current user
 
->>>>>>> variant B
 2010-09-14  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* UI/Common/UIxPageFrame.m (-systemAdditionalJSFiles): new web
@@ -15,8 +13,6 @@
 	* SoObjects/SOGo/SOGoDomainDefaults.m (-additionalJSFiles): new
 	accessor for the new "SOGoUIAdditionalJSFiles" user default.
 
-####### Ancestor
-======= end
 2010-09-13  Ludovic Marcotte  <lmarcotte@inverse.ca>
 
         * Updated Ukrainian translation - patch from