remove conflict indicator
authorAlfons Hoogervorst <alfons@proteus.demon.nl>
Tue, 31 Jul 2001 17:35:01 +0000 (17:35 +0000)
committerAlfons Hoogervorst <alfons@proteus.demon.nl>
Tue, 31 Jul 2001 17:35:01 +0000 (17:35 +0000)
commit18660be752853a8be9a982ab0fa755562bc99a46
tree03f277a3b2756acd3762b6dc58cade161a7637a8
parent6de30e71829d78382399873a444eb409c436ffbe
remove conflict indicator
ChangeLog.claws