[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r114708: Remove erroneously-committed merge comment.
|
From: |
Reuben Thomas |
|
Subject: |
[Emacs-diffs] trunk r114708: Remove erroneously-committed merge comment. |
|
Date: |
Fri, 18 Oct 2013 08:48:38 +0000 |
|
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 114708
revision-id: address@hidden
parent: address@hidden
committer: Reuben Thomas <address@hidden>
branch nick: trunk
timestamp: Fri 2013-10-18 09:48:33 +0100
message:
Remove erroneously-committed merge comment.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2013-10-18 07:56:45 +0000
+++ b/lisp/ChangeLog 2013-10-18 08:48:33 +0000
@@ -6976,7 +6976,6 @@
* progmodes/f90.el (f90-imenu-generic-expression):
Fix typo in 2013-05-08 change. (Bug#14402)
->>>>>>> MERGE-SOURCE
2013-05-14 Jean-Philippe Gravel <address@hidden>
* progmodes/gdb-mi.el (gdb-running, gdb-starting):
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r114708: Remove erroneously-committed merge comment.,
Reuben Thomas <=