From c2ee900569916fac1b939549e153c9344dca8c0a Mon Sep 17 00:00:00 2001
From: jenglish <jenglish@flightlab.com>
Date: Fri, 23 May 2008 18:00:38 +0000
Subject: (remove conflict marker -- oops)

---
 ChangeLog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 1468ecc..513d8a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -33,7 +33,6 @@
 
 	* doc/ttk_*: 'identify' widget command is on all ttk widgets.
 
->>>>>>> 1.1929
 2008-05-04  Joe English  <jenglish@users.sourceforge.net>
 
 	* macosx/ttkMacOSAquaTheme.c: "default" and "focus" adornments
-- 
cgit v0.12