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

[Chong Yidong]

Index: emacs/lisp/ChangeLog
diff -u emacs/lisp/ChangeLog:1.9591 emacs/lisp/ChangeLog:1.9592
--- emacs/lisp/ChangeLog:1.9591 Wed May 24 14:21:51 2006
+++ emacs/lisp/ChangeLog        Wed May 24 14:25:50 2006
@@ -947,12 +947,10 @@
        than alias `list-diary-entries'.
 
 2006-04-29  Dan Nicolaescu  <address@hidden>
->>>>>>> 1.9511
 
-<<<<<<< ChangeLog
        * jit-lock.el (jit-lock-function): Check jit-lock-defer-timer is
        active before setting 'fontified to 'defer.
-=======
+
        * help-fns.el (describe-variable): Add info about safe local variables.
 
 2006-04-29  Richard Stallman  <address@hidden>
@@ -2211,7 +2209,6 @@
 
        * term/w32-win.el (mouse-set-font):
        Mention w32-list-proportional-fonts in the doc string.
->>>>>>> 1.9511
 
 2006-03-18  Kim F. Storm  <address@hidden>