[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r116980: lisp/ChangeLog: Remove merge marker.
|
From: |
Juanma Barranquero |
|
Subject: |
[Emacs-diffs] trunk r116980: lisp/ChangeLog: Remove merge marker. |
|
Date: |
Wed, 16 Apr 2014 10:03:50 +0000 |
|
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 116980
revision-id: address@hidden
parent: address@hidden
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Wed 2014-04-16 12:03:38 +0200
message:
lisp/ChangeLog: Remove merge marker.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2014-04-16 06:46:36 +0000
+++ b/lisp/ChangeLog 2014-04-16 10:03:38 +0000
@@ -131,7 +131,6 @@
* subr.el (with-silent-modifications): Don't bind deactivate-mark,
buffer-file-name, and buffer-file-truename any more.
->>>>>>> MERGE-SOURCE
2014-04-08 Leo Liu <address@hidden>
Use lexical-binding and require cl-lib.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r116980: lisp/ChangeLog: Remove merge marker.,
Juanma Barranquero <=