remove conflict indicators
authorChristian Schaller <uraeus@gnome.org>
Sun, 7 Mar 2004 11:26:27 +0000 (11:26 +0000)
committerChristian Schaller <uraeus@gnome.org>
Sun, 7 Mar 2004 11:26:27 +0000 (11:26 +0000)
commit5aa8875165a582f5aa48c2137744609794040980
treeaab15876b3c8f597c003ee193f05a0c9b677bc0a
parentc2bd172e390be9f72bd2442a19dd2cd7c7705013
remove conflict indicators

Original commit message from CVS:
remove conflict indicators
ChangeLog