Remove trailing ^M that prevent CVS-merging.
authorStefan Monnier <monnier@iro.umontreal.ca>
Sat, 17 Jun 2000 15:36:33 +0000 (15:36 +0000)
committerStefan Monnier <monnier@iro.umontreal.ca>
Sat, 17 Jun 2000 15:36:33 +0000 (15:36 +0000)
commitc2acf685ec1be2c05058cd5fcbe1211446501137
tree7f16474f11abf90a9913df7048c36c3c010a1a03
parent0df68e9f5b6b7efcaa1442fd3d139a4ef53ff660
Remove trailing ^M that prevent CVS-merging.
lisp/ChangeLog
lisp/time.el