*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0e97f2866a70d989903b9d4f4282546c93d8366b..5d3b960af596c0ad6c7c8297a8856632f31f1625 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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\e,Ad\e(Brv  <jan.h.d@swipnet.se>
 
        * cus-start.el (all): Add x-gtk-whole-detached-tool-bar.
@@ -237,7 +236,7 @@
 2006-02-11  Martin Rudalics  <rudalics@gmx.at>
 
        * 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.