# HG changeset patch
# User Kim F. Storm <storm@cua.dk>
# Date 1158828145 0
# Node ID 23cba716cd3463ca6f38bb8cb8e65fda4d1f042d
# Parent  fc2dc3f11c45ff81fd6f1fbfd841287076688590
*** empty log message ***

diff -r fc2dc3f11c45 -r 23cba716cd34 lisp/ChangeLog
--- 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