From d932f1fd475d5c482742fa8a794261ff80b06d5f Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Wed, 11 Jul 2012 14:09:37 +0000 Subject: [PATCH] Fixed merge Monotone-Parent: 6eabcf880fa6d4620fb9a1ed111b15bef9bd9877 Monotone-Revision: 2252f3047b058ea629e568aec7efb2b0432e3c0c Monotone-Author: ludovic@Sophos.ca Monotone-Date: 2012-07-11T14:09:37 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1c4d2d23a..b5df6d237 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,11 +1,9 @@ -<<<<<<< variant A 2012-07-11 Ludovic Marcotte * Finished the implementation and testing of the two new defaults. Also added documentation in the SOGo Installation and Configuration Guide. ->>>>>>> variant B 2012-07-10 Wolfgang Sourdeau * SoObjects/Appointments/SOGoAppointmentFolder.m @@ -26,8 +24,6 @@ (-resultForDAVBoolean:): new method that returns a BOOL from a DAV boolean. -####### Ancestor -======= end 2012-07-09 Ludovic Marcotte * Dropped old templates (SOGoAptMailDeletionReceipt.wox