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

[Romain Francoise]

Index: emacs/lisp/ChangeLog
diff -u emacs/lisp/ChangeLog:1.9144 emacs/lisp/ChangeLog:1.9145
--- emacs/lisp/ChangeLog:1.9144 Wed Feb 15 02:43:54 2006
+++ emacs/lisp/ChangeLog        Wed Feb 15 07:28:15 2006
@@ -44,7 +44,6 @@
        * files.el (hack-local-variables): Remove ignored variables before
        checking if any variables need setting.
 
->>>>>>> 1.9141
 2006-02-14  Jan Dj,Ad(Brv  <address@hidden>
 
        * cus-start.el (all): Add x-gtk-whole-detached-tool-bar.
@@ -237,7 +236,7 @@
 2006-02-11  Martin Rudalics  <address@hidden>
 
        * files.el (revert-buffer, recover-file): Replace buffer-read-only
-       with inhibit-read-only. Suggested by Stefan Monnier.
+       with inhibit-read-only.  Suggested by Stefan Monnier.
        (revert-buffer): Let insert-file-contents discard
        buffer-undo-list.  Simplify code.
        (find-file, find-file-existing, revert-buffer): Doc-string fixes.