[Commits] [SCM] claws branch, master, updated. 3.17.8-35-g8033e76e6

[paul at claws-mail.org]

The branch, master has been updated
       via  8033e76e6a6ac3d193a8ed90982ecdcbaaeff282 (commit)
      from  8c1a4c98087d84292d4b617af3a9306f6bb2a4b7 (commit)

Summary of changes:
 AUTHORS | 2 --
 1 file changed, 2 deletions(-)


- Log -----------------------------------------------------------------
commit 8033e76e6a6ac3d193a8ed90982ecdcbaaeff282
Author: Paul <paul at claws-mail.org>
Date:   Wed Mar 17 15:14:58 2021 +0000

    fix conflict

diff --git a/AUTHORS b/AUTHORS
index 478d93a1c..3c59565e2 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -332,8 +332,6 @@ contributors (in addition to the above; based on Changelog)
 	Jean Delvare
 	Damian Poddebniak
 	Alvar Penning
-<<<<<<< HEAD
-=======
 	Orivej Desh
 	Steve Randall
 	Ramin Yaghoubzadeh Torky

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail