1 files changed, 0 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 62e9630f5d..a23318695e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -110,7 +110,6 @@
 
 2000-07-25  Havoc Pennington  <hp@redhat.com>
 
->>>>>>> 1.1355
 	* gtk/gtkprogressbar.h: Implement new sane, 5-function API for
 	using GtkProgressBar. See Changes-2.0.txt for details.