diff options
| author | Stefan Monnier | 2000-06-17 15:36:33 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2000-06-17 15:36:33 +0000 |
| commit | c2acf685ec1be2c05058cd5fcbe1211446501137 (patch) | |
| tree | 7f16474f11abf90a9913df7048c36c3c010a1a03 /lisp/ChangeLog | |
| parent | 0df68e9f5b6b7efcaa1442fd3d139a4ef53ff660 (diff) | |
| download | emacs-c2acf685ec1be2c05058cd5fcbe1211446501137.tar.gz emacs-c2acf685ec1be2c05058cd5fcbe1211446501137.zip | |
Remove trailing ^M that prevent CVS-merging.
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 63b861f382f..b62884e10ab 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2000-06-17 Stefan Monnier <monnier@cs.yale.edu> | ||
| 2 | |||
| 3 | * time.el: Remove trailing ^M that prevent CVS-merging. | ||
| 4 | |||
| 1 | 2000-06-16 Stefan Monnier <monnier@cs.yale.edu> | 5 | 2000-06-16 Stefan Monnier <monnier@cs.yale.edu> |
| 2 | 6 | ||
| 3 | * Makefile.in (srcdir): Define for update-subdirs. | 7 | * Makefile.in (srcdir): Define for update-subdirs. |