diff options
| author | Romain Francoise <romain@orebokech.com> | 2007-03-01 13:58:24 +0000 |
|---|---|---|
| committer | Romain Francoise <romain@orebokech.com> | 2007-03-01 13:58:24 +0000 |
| commit | 404a2a4b527cf3c87783173b13b47a1787dcd6f2 (patch) | |
| tree | 7eabfe56429cb91e90b71af07d913303f7d0177e | |
| parent | cde6fe5cd0a02cdb697d3d0f3c026e42d9afc7dc (diff) | |
| download | emacs-404a2a4b527cf3c87783173b13b47a1787dcd6f2.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 78eb1443aea..6e4800031e6 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -45,7 +45,6 @@ * desktop.el: Delete header line listing me as maintainer. ->>>>>>> 1.10749 2007-02-28 Glenn Morris <rgm@gnu.org> * tutorial.el (tutorial--describe-nonstandard-key): Tweak text in |