From: Sam Steingold <sds@gnu.org>
Date: Mon, 3 Jan 2005 14:57:17 +0000 (+0000)
Subject: typo
X-Git-Tag: ttn-vms-21-2-B4~2951
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e922de02bb154b8142650c3404686544cb17d08a;p=emacs.git

typo
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8b9639cef9b..ac78d4d7f9a 100644
--- 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,