From 6feaf11097e6243a9882b7f7db37fb960a61e42b Mon Sep 17 00:00:00 2001
From: Juanma Barranquero <lekktu@gmail.com>
Date: Mon, 10 Mar 2008 22:53:10 +0000
Subject: [PATCH] *** empty log message ***

---
 lisp/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

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)
-- 
2.39.5