Fix merge conflict
authorMichael Rasmussen <mir@datanom.net>
Wed, 17 Mar 2021 15:36:53 +0000 (16:36 +0100)
committerMichael Rasmussen <mir@datanom.net>
Wed, 17 Mar 2021 15:36:53 +0000 (16:36 +0100)
Signed-off-by: Michael Rasmussen <mir@datanom.net>
1  2 
AUTHORS

diff --cc AUTHORS
index 5b5bae99be661dcd291bc414ba45291398604b45,3c59565e2c60f6b5dc9f95700955f8b837a27804..3b551265cd57d1ef7f8f8bfb6ed0247d62707062
+++ b/AUTHORS
@@@ -332,4 -332,6 +332,8 @@@ contributors (in addition to the above
        Jean Delvare
        Damian Poddebniak
        Alvar Penning
-     David Fletcher
++        David Fletcher
+       Orivej Desh
+       Steve Randall
+       Ramin Yaghoubzadeh Torky
++