remove changelog conflict indicators
authorChristian Schaller <uraeus@gnome.org>
Sat, 25 Sep 2004 14:54:01 +0000 (14:54 +0000)
committerChristian Schaller <uraeus@gnome.org>
Sat, 25 Sep 2004 14:54:01 +0000 (14:54 +0000)
commit8d6ca0bee58d8e1ac2ca511f33c6a2d2f1b1c096
tree544ea10aa65c3909e7488605ea42d821700e5595
parenta1345e25b47a2e4d21ed200b2d8536549ca07a2e
remove changelog conflict indicators

Original commit message from CVS:
remove changelog conflict indicators
ChangeLog