add \n appropriately.

[lilypond.git] / THANKS

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