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

Monotone-Parent: 89c8046bde59d4d200a7f039c310086919d53cfd
Monotone-Revision: 9e0909dcbb77a5837442df736d80607b0a3fb383

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-07-20T18:23:33
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog | 2 --
 1 file changed, 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2e0ed1af3..92cad4a05 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,3 @@
-<<<<<<< variant A
 2012-07-20  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* UI/WebServerResources/MailerUI.js (onEmailTo): append the email
@@ -81,7 +80,6 @@
 	(-save): don t swap the bytes of the version number as it would
 	return a wrong change number and a wrong change key for DB objects.
 
->>>>>>> variant B
 2012-07-20  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* OpenChange/NSObject+MAPIStore.m (-getSMTPAddrType:inMemCtx:):