*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index dcc88b3..8d1eae7 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2001-03-27  Kenichi Handa  <handa@etl.go.jp>
+
+       * international/kkc.el (kkc-save-init-file): Locally bind
+       print-length to nil.
+
 2001-03-26  Gerd Moellmann  <gerd@gnu.org>
 
        * textmodes/flyspell.el: Some doc fixes.
@@ -431,8 +436,22 @@
        * international/mule-cmds.el (set-locale-environment):
        Set system-messages-locale and system-time-locale, but only if the
        caller specifies a non-nil locale name.
+<<<<<<< ChangeLog
+
+2001-03-20  John Wiegley  <johnw@gnu.org>
+
+       * calendar/calendar.el (nongregorian-diary-listing-hook):
+       Added :options to cover the possible values.
+       (nongregorian-diary-marking-hook): Ditto.
+=======
+>>>>>>> 1.2177
 
+<<<<<<< ChangeLog
+       * cal-bahai.el, cal-menu.el, calendar.el, diary-lib.el,
+       * holidays.el: Added support for the Baha'i calendar system.
+=======
 2001-03-20  Gerd Moellmann  <gerd@gnu.org>
+>>>>>>> 1.2177
 
        * pcvs-util.el (cvs-bury-buffer): Bodiless `if' statements cause
        problems for the interpreter.  From: John Wiegley  <johnw@gnu.org>