Mercurial > emacs

changeset 59324:f023dc562e9c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
typo
author Sam Steingold <sds@gnu.org>
date Mon, 03 Jan 2005 14:57:17 +0000
parents da54d178ca74
children 68eaccfa130a
files lisp/ChangeLog
diffstat 1 files changed, 0 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Mon Jan 03 03:23:31 2005 +0000
+++ b/lisp/ChangeLog	Mon Jan 03 14:57:17 2005 +0000
@@ -63,7 +63,6 @@
 
 	* ses.el (copy-region-as-kill): Deactivate mark.
 
->>>>>>> 1.6818
 2005-01-01  Richard M. Stallman  <rms@gnu.org>
 
 	* replace.el (occur-1): If the output buffer is also an input,