From 8bf73b73b682ccbf2c588793e00133485a86bdf4 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Mon, 2 Jul 2012 19:49:05 +0000
Subject: [PATCH] Monotone-Parent: 47874ea582a8f97d988110f4d4174d2668de0fb0
 Monotone-Revision: 32541b6f161d32f977e2eaff040e594f4ef885b2

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-07-02T19:49:05
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 46995e658..43598829b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,3 @@
-<<<<<<< variant A
 2012-07-01  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* OpenChange/MAPIStoreRecurrenceUtils.m