From d7d5b8871f5ca3d0013d17c385a4c6e8aec700bc Mon Sep 17 00:00:00 2001
From: Romain Francoise <romain@orebokech.com>
Date: Sun, 11 Dec 2005 10:47:41 +0000
Subject: [PATCH] *** empty log message ***

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

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
-- 
2.39.2