From dfc2704303f51b376f9839a2f4669ad86bd1bfcb Mon Sep 17 00:00:00 2001
From: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Tue, 2 Jun 2009 12:25:11 +0000
Subject: [PATCH] merged the stuff

Monotone-Parent: 1a4c87b6d951f04cfe7725514b38d62ac6e8238d
Monotone-Revision: 710426e98f0728c70e579d7b3463e5b685fd05d9

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2009-06-02T12:25:11
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 73b8e88b0..1f6409f4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,3 @@
-<<<<<<< variant A
 2009-06-01  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* UI/MailerUI/UIxMailFolderActions.m (-deleteFolderAction):
@@ -10,14 +9,11 @@
 	* SoObjects/SOGo/SOGoPermissions.m: declared new "Delete Object"
 	permission.
 
->>>>>>> variant B
 2009-06-01  Cyril Robert <crobert@inverse.ca>
 
 	* UI/WebServerResources/UIxContactsUserFolders.js (onSearchFormSubmit): 
 	Fixed encoding issue/crash.
 
-####### Ancestor
-======= end
 2009-05-30  Ludovic Marcotte <lmarcotte@inverse.ca>
 
 	* Modified SOGoCalendarComponent.m so that we