Fix merge conflict

[claws.git] / AUTHORS

diff --git a/AUTHORS b/AUTHORS
index 5b5bae99be661dcd291bc414ba45291398604b45..3b551265cd57d1ef7f8f8bfb6ed0247d62707062 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -332,4 +332,8 @@ contributors (in addition to the above; based on Changelog)
        Jean Delvare
        Damian Poddebniak
        Alvar Penning
-    David Fletcher
+        David Fletcher
+       Orivej Desh
+       Steve Randall
+       Ramin Yaghoubzadeh Torky
+