# HG changeset patch
# User Sam Steingold <sds@gnu.org>
# Date 1104764237 0
# Node ID f023dc562e9c3a705ae7fcc792008e8ae6da61a8
# Parent  da54d178ca74573bbe64a48ea1ba97d89c27c11a
typo

diff -r da54d178ca74 -r f023dc562e9c lisp/ChangeLog
--- 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,