Doc -- fix compile error (faulty merge)

diff --git a/Documentation/snippets/anglican-psalm-template.ly b/Documentation/snippets/anglican-psalm-template.ly
index 83e78b56ae1974806550e0dfd1d0f917bb10d469..056f2d1bbad3132ee9477d0bd438417e1cf60c17 100644 (file)
--- a/Documentation/snippets/anglican-psalm-template.ly
+++ b/Documentation/snippets/anglican-psalm-template.ly
@@ -20,11 +20,6 @@ le varie possibilità.
   lsrtags = "vocal-music, template"
 
 
-<<<<<<< HEAD
-=======
-
-
->>>>>>> c3b519f... Doc-it: fix translations in snippets. Run makelsr.
 %% Translation of GIT committish: 144cd434d02e6d90b2fb738eeee99119a7c5e1d2
 
   texidocde = "