Fix upstream branch

[mirror_smartmontools-debian.git] / AUTHORS

diff --git a/AUTHORS b/AUTHORS
index 94316183f2837cbf5cd57025b5e16de4a04bfdaa..62cd8f2812dc7ce0c3bf8a8a2e73861d543acee1 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 $Id: AUTHORS 4285 2016-04-10 13:17:11Z chrfranke $
-=======
-$Id: AUTHORS 4101 2015-05-30 17:52:05Z chrfranke $
->>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
 
 Developers / Maintainers / Contributors:
 
@@ -16,10 +12,7 @@ Yuri Dario              <mc6530@mclink.it>
 Casper Dik              <...>
 Christian Franke        <franke@computer.org>
 Guilhem Frézou          <...>
-<<<<<<< HEAD
 Thomas Gatterweh        <thomas_gatterweh@hotmail.com>
-=======
->>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
 Douglas Gilbert         <dgilbert@interlog.com>
 Guido Guenther          <agx@sigxcpu.org>
 Jordan Hargrave         <jordan_hargrave@dell.com>