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

[Kim F. Storm]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Kim F. Storm <kfstorm>  06/09/21 08:42:25

Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.10105
retrieving revision 1.10106
diff -u -b -r1.10105 -r1.10106
--- ChangeLog   21 Sep 2006 08:40:32 -0000      1.10105
+++ ChangeLog   21 Sep 2006 08:42:25 -0000      1.10106
@@ -62,7 +62,6 @@
        * menu-bar.el (clipboard-yank): Bomb out in interactive use if
        buffer is read-only.
 
->>>>>>> 1.10102
 2006-09-18  Ken Manheimer  <address@hidden>
 
        * allout.el (allout-unprotected): Let inhibit-read-only only when