# HG changeset patch
# User Romain Francoise <romain@orebokech.com>
# Date 1172757504 0
# Node ID 5ae1368180c390df5099d46a913836671ad0f113
# Parent  cd3e9a5647d3b28ed5ff27f94fc4a98e401dda20
Remove conflict marker.

diff -r cd3e9a5647d3 -r 5ae1368180c3 lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Mar 01 13:43:48 2007 +0000
+++ b/lisp/ChangeLog	Thu Mar 01 13:58:24 2007 +0000
@@ -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