reverted unwanted commits

[lilypond.git] / THANKS

diff --git a/THANKS b/THANKS
index 49e9e0524a2c41d99b6530270ae9b95e58c471aa..cf2c2e3361bd12c0314bf80728e677edbb88c3ef 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -10,14 +10,13 @@ Mats Bengtsson    - Support Guru
 
 CONTRIBUTORS
 
-Angelo Contardi
 David Feuer
 Erik Sandberg
 Erlend Aasland
-Guido Amoruso
 Heikki Junes
 Joe Neeman
 
+
 SPONSORS
 
 Andrew Sidwell
@@ -47,29 +46,25 @@ Anthony Youngman
 Aurèle Duda
 Bernie Arai
 Cameron Horsburgh
-Charles Cave
 Christian Hitz
 Christopher Ellis
 Claude Routhier
 Colin Wilding
-Daniel Tonda Castillo
 David Rogers
 Francisco Vila
 Harald Wellmann
-Johannes Schindelin
 J. Leung
+<<<<<<< THANKS
+Harald Wellmann
 Karim Haddad
+=======
+>>>>>>> 1.238
 Karl Hammar
 Keith Packard
-Kieren MacMillian
-Lee T. Wilkirson
 Mark Dewey
 Markus Schneider
-Matti Aaltonen
 Michael Meixner
-Michael Welsh Duggan
 Orm Finnendahl
-Paul Scott
 Quentin Spencer
 Rainer Typke
 Rick Hansen
@@ -178,7 +173,7 @@ Patrick K Welton
 Paul Scott
 Ralph Little
 Richard Schoeller
-Robert Vlasaty
+Robert Vlatasy
 Roman Kurakin
 Russell Lang
 Scott Russell
@@ -412,7 +407,7 @@ Pawel D
 Pedro Kroger
 Ray McKinney
 Reuben Thomas
-Robert Vlasaty
+Robert Vlatasy
 Stef Epardaud
 Thomas Willhalm
 Thomas Scharkowski