From: Carl Sorensen <c_sorensen@byu.edu>
Date: Fri, 22 Jul 2011 10:35:18 +0000 (-0600)
Subject: Doc -- fix compile error (faulty merge)
X-Git-Tag: release/2.14.2-1~2
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=674a80f9855972aced25834475e94767f0ac4838;p=lilypond.git

Doc -- fix compile error (faulty merge)
---

diff --git a/Documentation/snippets/anglican-psalm-template.ly b/Documentation/snippets/anglican-psalm-template.ly
index 83e78b56ae..056f2d1bba 100644
--- 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 = "