# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 961256193 0
# Node ID a70985b2a88f5f5586c36c9c60421c66cff18128
# Parent  1030e638c8ddf115ac7a54e893be6a117e479708
*** empty log message ***

diff -r 1030e638c8dd -r a70985b2a88f lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Jun 17 15:35:59 2000 +0000
+++ b/lisp/ChangeLog	Sat Jun 17 15:36:33 2000 +0000
@@ -1,3 +1,7 @@
+2000-06-17  Stefan Monnier  <monnier@cs.yale.edu>
+
+	* time.el: Remove trailing ^M that prevent CVS-merging.
+
 2000-06-16  Stefan Monnier  <monnier@cs.yale.edu>
 
 	* Makefile.in (srcdir): Define for update-subdirs.