remove conflict indicator
authorChristian Schaller <uraeus@gnome.org>
Tue, 28 Feb 2006 10:40:01 +0000 (10:40 +0000)
committerChristian Schaller <uraeus@gnome.org>
Tue, 28 Feb 2006 10:40:01 +0000 (10:40 +0000)
commitaa8a5cb824d4079061fd121d6cc2a0777c99a4dc
treed688e98831ed4e0e55522ab9b77da39cb51b14dc
parent08f49d1eba9828bb4c4dd054297d1239e52bb0ea
remove conflict indicator

Original commit message from CVS:
remove conflict indicator
ChangeLog