# HG changeset patch
# User Juanma Barranquero <lekktu@gmail.com>
# Date 1205189590 0
# Node ID a63b955aa9899b490a0ba3bf4a1be26410f02144
# Parent  84f75770f0f3903cb354b1e3b29d8d8ff7717dca
*** empty log message ***

diff -r 84f75770f0f3 -r a63b955aa989 lisp/ChangeLog
--- a/lisp/ChangeLog	Mon Mar 10 22:43:56 2008 +0000
+++ b/lisp/ChangeLog	Mon Mar 10 22:53:10 2008 +0000
@@ -65,7 +65,6 @@
 	* progmodes/cc-langs.el (c-before-font-lock-function): Fix bug in
 	doc-string, "c-old-LEN" -> "c-old-END".
 
->>>>>>> 1.11049.2.667
 2008-02-29  Glenn Morris  <rgm@gnu.org>
 
 	* allout.el (allout-topic-encryption-bullet)