From: Juanma Barranquero <lekktu@gmail.com>
Date: Thu, 5 Dec 2002 07:26:01 +0000 (+0000)
Subject: Remove conflict marker.
X-Git-Tag: emacs-pretest-21.2.93~2
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c6526ebb2cc33daadec85c52c77130a14387f607;p=emacs.git

Remove conflict marker.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e9eb5f21f99..5d2407e979a 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