From 53914f1a874b7c66fafe3674ee7c824c5d69032f Mon Sep 17 00:00:00 2001
From: Christoph Hohmann <reboot@gmx.ch>
Date: Wed, 24 Sep 2003 18:59:13 +0000
Subject: [PATCH] update ChangeLog.claws

---
 AUTHORS         | 1 +
 ChangeLog.claws | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/AUTHORS b/AUTHORS
index 8b9f6fb9a..24f72d76b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -195,3 +195,4 @@ contributors (beside the above; based on Changelog)
 	Martin Wicke
 	Pawel Pêkala
 	Bogdan Sumanariu
+	David Relson
diff --git a/ChangeLog.claws b/ChangeLog.claws
index 2963862dc..d16755c90 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -3,6 +3,8 @@
 	* src/compose.c
 		fix generating of headers
 
+	(patch by David Relson <relson@osagesoftware.com>)
+
 2003-09-23 [paul]	0.9.5claws27
 
 	* po/zh_CN.po
@@ -18,7 +20,6 @@
 		sylpheed's xml format
 		submitted by Bogdan Sumanariu <bsumanariu@one5.ro>
 
->>>>>>> 1.2533
 2003-09-22 [paul]	0.9.5claws25
 
 	* src/plugins/clamav/clamav_plugin.c
-- 
2.25.1