diff options
| -rw-r--r-- | lisp/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 15b1a38e820..87d834af763 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -557,7 +557,6 @@ FILENAME. * net/trampver.el: Update release number. ->>>>>>> MERGE-SOURCE 2014-06-15 Stefan Monnier <monnier@iro.umontreal.ca> |