diff options
| author | Sam Steingold | 2005-01-03 14:57:17 +0000 |
|---|---|---|
| committer | Sam Steingold | 2005-01-03 14:57:17 +0000 |
| commit | e922de02bb154b8142650c3404686544cb17d08a (patch) | |
| tree | 5222ac4c5a9f8c0a60c8c9a9741701d739ff1f54 | |
| parent | ffbec9baad8c6b097fb3d0c932566e3a314b07b3 (diff) | |
| download | emacs-e922de02bb154b8142650c3404686544cb17d08a.tar.gz emacs-e922de02bb154b8142650c3404686544cb17d08a.zip | |
typo
| -rw-r--r-- | lisp/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8b9639cef9b..ac78d4d7f9a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -63,7 +63,6 @@ | |||
| 63 | 63 | ||
| 64 | * ses.el (copy-region-as-kill): Deactivate mark. | 64 | * ses.el (copy-region-as-kill): Deactivate mark. |
| 65 | 65 | ||
| 66 | >>>>>>> 1.6818 | ||
| 67 | 2005-01-01 Richard M. Stallman <rms@gnu.org> | 66 | 2005-01-01 Richard M. Stallman <rms@gnu.org> |
| 68 | 67 | ||
| 69 | * replace.el (occur-1): If the output buffer is also an input, | 68 | * replace.el (occur-1): If the output buffer is also an input, |