emacs-diffs
[Top][All Lists]
Advanced

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

[Emacs-diffs] /srv/bzr/emacs/trunk r104736: ChangeLog fix.


From: Glenn Morris
Subject: [Emacs-diffs] /srv/bzr/emacs/trunk r104736: ChangeLog fix.
Date: Sun, 26 Jun 2011 11:10:51 -0700
User-agent: Bazaar (2.3.1)

------------------------------------------------------------
revno: 104736
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sun 2011-06-26 11:10:51 -0700
message:
  ChangeLog fix.
modified:
  lisp/ChangeLog
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-06-26 16:47:39 +0000
+++ b/lisp/ChangeLog    2011-06-26 18:10:51 +0000
@@ -997,7 +997,6 @@
        * iswitchb.el (iswitchb-window-buffer-p): Use `member' instead of
        `memq' (Bug#8799).
 
->>>>>>> MERGE-SOURCE
 2011-06-02  Stefan Monnier  <address@hidden>
 
        * subr.el (make-progress-reporter): Add "..." by default (bug#8785).


reply via email to

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