fixed merge conflicts in ChangeLog
authorJeffrey Stedfast <fejj@src.gnome.org>
Wed, 23 Apr 2003 18:16:23 +0000 (18:16 +0000)
committerJeffrey Stedfast <fejj@src.gnome.org>
Wed, 23 Apr 2003 18:16:23 +0000 (18:16 +0000)
commit5d1f5b087ba1f9ca690b478b073c6605e1d62eaf
treec18e8320c0d43f25f760b62f7cddfdf5dc7eced8
parent7877167c6108f2eb1445c1b3d3160cc9f43fe3d3
fixed merge conflicts in ChangeLog
camel/ChangeLog