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)
commit71cd789935d416ec7b17b41199038338006dc2eb
treea83b90ea90aabf8cc96fe9fabd8a06dabe0e3e73
parent72d23ae6a7fa553b562f68941b78ecf06423a631
remove changelog conflict indicators

Original commit message from CVS:
remove changelog conflict indicators
ChangeLog