1 files changed, 0 insertions, 1 deletions
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