1 files changed, 0 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 74f6a87..fff0cff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -81,13 +81,8 @@
 
 2010-04-25  Miguel Sofer  <msofer@users.sf.net>
 
-<<<<<<< ChangeLog
-	* generic/tclBasic.c:    Add unsupported [yieldm] command.
-	* generic/tclInt.h:
-=======
 	* generic/tclBasic.c:    Add unsupported [yieldm] command. Credit
 	* generic/tclInt.h:      Lars Hellstrom for the basic idea.
->>>>>>> 1.5083
 
 2010-04-24  Miguel Sofer  <msofer@users.sf.net>