From: Romain Francoise <romain@orebokech.com>
Date: Thu, 1 Mar 2007 13:58:24 +0000 (+0000)
Subject: Remove conflict marker.
X-Git-Tag: emacs-pretest-22.0.95~12
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=404a2a4b527cf3c87783173b13b47a1787dcd6f2;p=emacs.git

Remove conflict marker.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 78eb1443aea..6e4800031e6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -45,7 +45,6 @@
 
 	* desktop.el: Delete header line listing me as maintainer.
 
->>>>>>> 1.10749
 2007-02-28  Glenn Morris  <rgm@gnu.org>
 
 	* tutorial.el (tutorial--describe-nonstandard-key): Tweak text in