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)
ChangeLog.claws

index 8ffedaa7e244fede2280f3f27b9de89fe0d1ce75..8407bf339dd4647372c98fccd5c9f7a3a6ad78ee 100644 (file)
@@ -49,7 +49,6 @@
                updated
                (submitted by Fabio Junior Beneditto)
 
->>>>>>> 1.258
 2001-07-28 [paul]
 
        * src/procmime.c