From: Glenn Morris <rgm@gnu.org>
Date: Sun, 26 Jun 2011 18:10:51 +0000 (-0700)
Subject: ChangeLog fix.
X-Git-Tag: emacs-pretest-24.0.90~104^2~152^2~386
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=247f696e50461a50306bc77d3683007bd06e8ba7;p=emacs.git

ChangeLog fix.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 38675a6efb1..296b992508d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -997,7 +997,6 @@
 	* iswitchb.el (iswitchb-window-buffer-p): Use `member' instead of
 	`memq' (Bug#8799).
 
->>>>>>> MERGE-SOURCE
 2011-06-02  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* subr.el (make-progress-reporter): Add "..." by default (bug#8785).