diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6c506d82283..06ec64917ab 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -67,7 +67,6 @@
 	* emacs/octave-mod.el (octave-electric-space): Don't indent
 	comments or strings if octave-auto-indent is nil.
 
->>>>>>> 1.8782
 2005-12-10  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
 	* term/mac-win.el: Require url when compiling.  Call