Mercurial > emacs

changeset 76254:5ae1368180c3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove conflict marker.
author Romain Francoise <romain@orebokech.com>
date Thu, 01 Mar 2007 13:58:24 +0000
parents cd3e9a5647d3
children 985cc73beb79
files lisp/ChangeLog
diffstat 1 files changed, 0 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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