# HG changeset patch
# User Juanma Barranquero <lekktu@gmail.com>
# Date 1282174359 -7200
# Node ID e1a5ebb1ce1c1aa2e6cacaf7601cfb9e81235959
# Parent  dbb2115db9d9f6bce24dcc7d15d54b130afd4774
lisp/ChangeLog: Remove merge markers.

diff -r dbb2115db9d9 -r e1a5ebb1ce1c lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Aug 18 20:24:52 2010 +0200
+++ b/lisp/ChangeLog	Thu Aug 19 01:32:39 2010 +0200
@@ -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.