fix conflicts

diff --cc ChangeLog
index a717b52895d506bc291119acad1f3bbdb68ccc64,054ba371e2c338708aafc7aee1837e290e5d807e..e07a5f97f7e873e44de11e78a2d020f3bbc55019
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,12 +1,16 @@@
- 28 Jun 2008  Kevin Rosenberg <kevin@rosenberg.net>
-       * Version 1.96
++28 Jan 2008  Kevin Rosenberg <kevin@rosenberg.net>
++      * Version 1.98
 +      * {datetime,strings,tests}.lisp: Add remove-char-string
 +
+ 18 Sep 2007  Kevin Rosenberg <kevin@rosenberg.net>
+       * Version 1.97
+       * datetime.lisp: Improve output format for date-string
+ 
+ 10 Sep 2007  Kevin Rosenberg <kevin@rosenberg.net>
+       * Version 1.96
+       * byte-stream.lisp: Use without-package-locks as suggested
+       by Daniel Gackle.       
+ 
  01 Jun 2007  Kevin Rosenberg <kevin@rosenberg.net>
        * Version 1.95
        * {datetime,package}.lisp: Add day-of-week and pretty-date-ut

diff --cc datetime.lisp
Simple merge