diff options
| author | Juanma Barranquero <lekktu@gmail.com> | 2002-12-05 07:26:01 +0000 |
|---|---|---|
| committer | Juanma Barranquero <lekktu@gmail.com> | 2002-12-05 07:26:01 +0000 |
| commit | c6526ebb2cc33daadec85c52c77130a14387f607 (patch) | |
| tree | e5cf2be9d5800f4e0d8476910fa3b08cdb107261 | |
| parent | 87c7f58af9afcea2bf1993414d0cef2d98f0350d (diff) | |
| download | emacs-c6526ebb2cc33daadec85c52c77130a14387f607.tar.gz | |
Remove conflict marker.
| -rw-r--r-- | lisp/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
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 |