added bughunter

diff --git a/THANKS b/THANKS
index e7d3b59422af0478fe44d2e011efd270091f6901..85b0b71f563bc01c0fdc58b66054e37988d1278c 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -54,11 +54,7 @@ David Rogers
 Francisco Vila
 Harald Wellmann
 J. Leung
-<<<<<<< THANKS
-Harald Wellmann
 Karim Haddad
-=======
->>>>>>> 1.238
 Karl Hammar
 Keith Packard
 Lee T. Wilkirson
@@ -66,6 +62,7 @@ Mark Dewey
 Markus Schneider
 Michael Meixner
 Orm Finnendahl
+Paul Scott
 Quentin Spencer
 Rainer Typke
 Rick Hansen