From 6f293f276ebee0441528cf50c2302d8d27926fe8 Mon Sep 17 00:00:00 2001
From: Juanma Barranquero <lekktu@gmail.com>
Date: Thu, 5 Dec 2002 07:26:01 +0000
Subject: Remove conflict marker.

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fc929e6b34b..9eef0f86cac 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -40,7 +40,6 @@
 	* progmodes/etags.el (find-tag-default): Copy text at point without
 	properties.
 
->>>>>>> 1.2776.2.248
 2002-11-11  Fabrice Bauzac  <fabrice.bauzac@wanadoo.fr>  (tiny change)
 
 	* dired-aux.el (dired-show-file-type): Format filename with "%s" to
-- 
cgit v1.2.1