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 | 6f293f276ebee0441528cf50c2302d8d27926fe8 (patch) | |
| tree | f7091cf66dd4f95743533586d6dba917b5f48386 | |
| parent | 0ede7bd2ffe9c5f1c46ddfb68b92afe623ddf4fb (diff) | |
| download | emacs-6f293f276ebee0441528cf50c2302d8d27926fe8.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 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 |