Remove conflict markers. Adjust date: 2006-03-23 -> 2006-04-12
authorReiner Steib <Reiner.Steib@gmx.de>
Wed, 12 Apr 2006 12:33:38 +0000 (12:33 +0000)
committerReiner Steib <Reiner.Steib@gmx.de>
Wed, 12 Apr 2006 12:33:38 +0000 (12:33 +0000)
commita6abc7bab722cf23b7dceabf485d023e44c14392
treedd10c8006f5455733b470f07f5e1d9e58008ab2a
parent449bb3074cdd265ea4a3b6853e7c97d96d56ec30
Remove conflict markers.  Adjust date: 2006-03-23 -> 2006-04-12
lisp/ChangeLog