emacs-diffs
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] Changes to emacs/lisp/ChangeLog

From: Romain Francoise
Subject: [Emacs-diffs] Changes to emacs/lisp/ChangeLog
Date: Wed, 19 Apr 2006 06:29:48 +0000 
Index: emacs/lisp/ChangeLog
diff -u emacs/lisp/ChangeLog:1.9418 emacs/lisp/ChangeLog:1.9419
--- emacs/lisp/ChangeLog:1.9418 Tue Apr 18 23:49:28 2006
+++ emacs/lisp/ChangeLog        Wed Apr 19 06:29:47 2006
@@ -216,7 +216,6 @@
 
        * subr.el (read-passwd): Bind `message-log-max' to nil.
 
->>>>>>> 1.9411
 2006-04-12  Stefan Monnier  <address@hidden>
 
        * progmodes/perl-mode.el (perl-indent-new-calculate):
reply via email to
[Prev in Thread] Current Thread [Next in Thread]