diff options
| author | Glenn Morris <rgm@gnu.org> | 2014-06-27 21:55:17 -0400 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2014-06-27 21:55:17 -0400 |
| commit | 01c442500fe3494226420cf776a8ba4134dda74e (patch) | |
| tree | 39485c447b8bb89c9fd8bb94c9591dfc2182bbeb | |
| parent | b1c4d6861e0f1e84c37c3df034b1f6d6dea7dcbf (diff) | |
| download | emacs-01c442500fe3494226420cf776a8ba4134dda74e.tar.gz | |
ChangeLog fix
| -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> |