X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=THANKS;h=cf2c2e3361bd12c0314bf80728e677edbb88c3ef;hb=b3cf2199183a184c7eef9a9f8f3c9a691db1f0ad;hp=40be0a2918a7213ea3758eb8982653a17dbfa9f3;hpb=ffb9d71ab52ad8d9a891f8070525d949789e5058;p=lilypond.git

diff --git a/THANKS b/THANKS
index 40be0a2918..cf2c2e3361 100644
--- 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