summaryrefslogtreecommitdiff
path: root/lisp/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/ChangeLog')
-rw-r--r--lisp/ChangeLog1
1 files changed, 0 insertions, 1 deletions
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