From 18660be752853a8be9a982ab0fa755562bc99a46 Mon Sep 17 00:00:00 2001
From: Alfons Hoogervorst <alfons@proteus.demon.nl>
Date: Tue, 31 Jul 2001 17:35:01 +0000
Subject: [PATCH] remove conflict indicator

---
 ChangeLog.claws | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 8ffedaa7e..8407bf339 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -49,7 +49,6 @@
 		updated
 		(submitted by Fabio Junior Beneditto)
 
->>>>>>> 1.258
 2001-07-28 [paul]
 
 	* src/procmime.c
-- 
2.25.1