From: Juanma Barranquero <lekktu@gmail.com>
Date: Wed, 18 Aug 2010 23:32:39 +0000 (+0200)
Subject: lisp/ChangeLog: Remove merge markers.
X-Git-Tag: emacs-pretest-23.2.90~139^2~14
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9b3d6a42efd17fb2a9f01b128b10b17da5296c98;p=emacs.git

lisp/ChangeLog: Remove merge markers.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 45c5fd52d99..578f5e4fb49 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -73,7 +73,6 @@
 	(ctext-no-compositions): Doc fix.
 	(compound-text-with-extensions): Doc fix.
 
->>>>>>> MERGE-SOURCE
 2010-08-04  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* simple.el (exchange-dot-and-mark): Mark obsolete, finally.