Monotone-Parent: 47874ea582a8f97d988110f4d4174d2668de0fb0

Monotone-Revision: 32541b6f161d32f977e2eaff040e594f4ef885b2 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2012-07-02T19:49:05 Monotone-Branch: ca.inverse.sogo
2012-07-02 19:49:05 +00:00 · 2012-07-02 19:49:05 +00:00 · 8bf73b73b6
parent 9ff48bda9d
commit 8bf73b73b6
1 changed files with 0 additions and 1 deletions
--- a/1
+++ b/1
@ -1,4 +1,3 @@
-<<<<<<< variant A
 2012-07-01  Wolfgang Sourdeau  <wsourdeau@inverse.ca>

 	* OpenChange/MAPIStoreRecurrenceUtils.m