2011/7/22 Francisco Vila <[email protected]>: > I have found a probable cause in anglican-psalm-template.ly which has > remains of <<<<<< HEAD conflict marks in that branch. I could make a > patch or else wait for confirmation.
A patch. It applies to stable/2.14 only. Sorry for the chat style. -- Francisco Vila. Badajoz (Spain) www.paconet.org , www.csmbadajoz.com
From 92206afcb3073b8b7e9c8be01bafd3181084f3a2 Mon Sep 17 00:00:00 2001 From: Francisco Vila <[email protected]> Date: Fri, 22 Jul 2011 12:45:35 +0200 Subject: [PATCH] Stable build fix. --- Documentation/snippets/anglican-psalm-template.ly | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/Documentation/snippets/anglican-psalm-template.ly b/Documentation/snippets/anglican-psalm-template.ly index 83e78b5..056f2d1 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 = " -- 1.7.4.1
_______________________________________________ lilypond-devel mailing list [email protected] https://lists.gnu.org/mailman/listinfo/lilypond-devel
