From: Juanma Barranquero <lekktu@gmail.com>
Date: Mon, 10 Mar 2008 22:53:10 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-22.2~51
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6feaf11097e6243a9882b7f7db37fb960a61e42b;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f86c68f21e9..2eb9c12ed2c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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)