]> git.eshelyaron.com Git - emacs.git/commitdiff
Remove conflict marker.
authorRomain Francoise <romain@orebokech.com>
Wed, 19 Apr 2006 06:29:47 +0000 (06:29 +0000)
committerRomain Francoise <romain@orebokech.com>
Wed, 19 Apr 2006 06:29:47 +0000 (06:29 +0000)
lisp/ChangeLog

index 10607fce53b2ffe2034ddafdfb83c167e0fe26af..b445532262c7a72c44df8c39c4f514babfad57e0 100644 (file)
 
        * subr.el (read-passwd): Bind `message-log-max' to nil.
 
->>>>>>> 1.9411
 2006-04-12  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * progmodes/perl-mode.el (perl-indent-new-calculate):