Mercurial > emacs

changeset 67501:d25e579a6232

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
author Romain Francoise <romain@orebokech.com>
date Sun, 11 Dec 2005 10:47:41 +0000
parents e94d15e8e9b3
children a4d770fc1404
files lisp/ChangeLog
diffstat 1 files changed, 0 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Sun Dec 11 09:57:08 2005 +0000
+++ b/lisp/ChangeLog	Sun Dec 11 10:47:41 2005 +0000
@@ -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