typo

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8b9639cef9b9071c349a1963494fa5e684fae4ad..ac78d4d7f9ac2ad1e6262b4d38a6d297e0b8e5c5 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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,