From: Erik Sandberg <mandolaerik@gmail.com>
Date: Wed, 28 Jun 2006 05:11:23 +0000 (+0000)
Subject: added bughunter
X-Git-Tag: release/2.10.0-2~487
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=2c3cae94d22c7e4fdd103fa517a1a39ef6086ec7;p=lilypond.git

added bughunter
---

diff --git a/THANKS b/THANKS
index e7d3b59422..85b0b71f56 100644
--- 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