* lily/ various: Introduce stream events of types Prepare,

[lilypond.git] / THANKS

diff --git a/THANKS b/THANKS
index 40be0a2918a7213ea3758eb8982653a17dbfa9f3..cf2c2e3361bd12c0314bf80728e677edbb88c3ef 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -54,6 +54,11 @@ David Rogers
 Francisco Vila
 Harald Wellmann
 J. Leung
+<<<<<<< THANKS
+Harald Wellmann
+Karim Haddad
+=======
+>>>>>>> 1.238
 Karl Hammar
 Keith Packard
 Mark Dewey