HCoop / bpt / emacs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b1c4d68)
ChangeLog fix
authorGlenn Morris <rgm@gnu.org>
Sat, 28 Jun 2014 01:55:17 +0000 (21:55 -0400)
committerGlenn Morris <rgm@gnu.org>
Sat, 28 Jun 2014 01:55:17 +0000 (21:55 -0400)
lisp/ChangeLog patch | blob | blame | history

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 15b1a38..87d834a 100644 (file)
--- 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>
 
Unnamed repository; edit this file 'description' to name the repository.