Remove conflict marker.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e9eb5f21f99901e5f4eff9dd47fe23eb90c04176..5d2407e979ae7252ef74990dbf1ed4e04ca78473 100644 (file)
--- 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