Mercurial > emacs

changeset 73039:23cba716cd34

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
author Kim F. Storm <storm@cua.dk>
date Thu, 21 Sep 2006 08:42:25 +0000
parents fc2dc3f11c45
children 79fe2faffbf8
files lisp/ChangeLog
diffstat 1 files changed, 0 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Thu Sep 21 08:40:32 2006 +0000
+++ b/lisp/ChangeLog	Thu Sep 21 08:42:25 2006 +0000
@@ -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  <ken.manheimer@gmail.com>
 
 	* allout.el (allout-unprotected): Let inhibit-read-only only when