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)
commit2db3e46a44dea5e69aef59a50d03d33926dbc043
tree6bdc9ffc3d72ab1028ba5fc5ec2b48973940cb43
parent4249cf6e1e233323f5eca2e582432a1cf43690b8
remove changelog conflict indicators

Original commit message from CVS:
remove changelog conflict indicators
ChangeLog