commit 8033e76e6a6ac3d193a8ed90982ecdcbaaeff282 parent 8c1a4c98087d84292d4b617af3a9306f6bb2a4b7 Author: Paul <paul@claws-mail.org> Date: Wed, 17 Mar 2021 15:14:58 +0000 fix conflict Diffstat:
| M | AUTHORS | | | 2 | -- |
1 file changed, 0 insertions(+), 2 deletions(-)
diff --git 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