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)
commit3abd8a559ebc12949040a631381ba22be480a8f1
tree20b545e1a9df0829a02d2dce9b7bb3d2a917c988
parentb854b950e72e6105218119a625ca66681702552e
remove conflict indicators

Original commit message from CVS:
remove conflict indicators
ChangeLog