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)
commit87d5670f80f7d371c098710d5798ba4736ed9604
tree30f4ec1832738268cd33a2b2bff73983f6938e8a
parentc0a0422f35f26f863616b9704793cd3af605af1c
remove conflict indicators

Original commit message from CVS:
remove conflict indicators
ChangeLog