typo

e922de02 · Sam Steingold · ffbec9ba · e922de02
Commit e922de02 authored Jan 03, 2005 by Sam Steingold
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

lisp/ChangeLog lisp/ChangeLog +0 -1

No files found.
--- 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,