emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] trunk r117431: ChangeLog fix


From: Glenn Morris
Subject: [Emacs-diffs] trunk r117431: ChangeLog fix
Date: Sat, 28 Jun 2014 01:55:21 +0000
User-agent: Bazaar (2.6b2)

------------------------------------------------------------
revno: 117431
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2014-06-27 21:55:17 -0400
message:
  ChangeLog fix
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-06-28 01:52:38 +0000
+++ b/lisp/ChangeLog    2014-06-28 01:55:17 +0000
@@ -557,7 +557,6 @@
        FILENAME.
 
        * net/trampver.el: Update release number.
->>>>>>> MERGE-SOURCE
 
 2014-06-15  Stefan Monnier  <address@hidden>
 


reply via email to

[Prev in Thread] Current Thread [Next in Thread]