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