Mercurial > emacs

changeset 80316:a63b955aa989

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
author Juanma Barranquero <lekktu@gmail.com>
date Mon, 10 Mar 2008 22:53:10 +0000
parents 84f75770f0f3
children e540c42e9741
files lisp/ChangeLog
diffstat 1 files changed, 0 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Mon Mar 10 22:43:56 2008 +0000
+++ b/lisp/ChangeLog	Mon Mar 10 22:53:10 2008 +0000
@@ -65,7 +65,6 @@
 	* progmodes/cc-langs.el (c-before-font-lock-function): Fix bug in
 	doc-string, "c-old-LEN" -> "c-old-END".
 
->>>>>>> 1.11049.2.667
 2008-02-29  Glenn Morris  <rgm@gnu.org>
 
 	* allout.el (allout-topic-encryption-bullet)