Ahh, possibly. A couple of lines had white space,
which were removed automatically when I applied the
patch. Sorry - I should have mentioned it. They
were in lines 36 and 71 of the patch file. It's
probably easiest for you to simply reset hard your
branch to just before your patch and pull again.
Trevor
----- Original Message -----
From: "Jonathan Kulp" <[email protected]>
To: "Trevor Daniels" <[email protected]>
Cc: "Kieren MacMillan" <[email protected]>;
"lilypond-devel List" <[email protected]>
Sent: Wednesday, May 13, 2009 12:04 PM
Subject: Re: [PATCH]Re: tempoMark - documentation and use
Ugh. I have a merge conflict upon pulling. Did I mess up the
patch?
Jon
Trevor Daniels wrote:
Thanks Jon - pushed to origin/master
Trevor
----- Original Message ----- From: "Jonathan Kulp"
<[email protected]>
To: "Kieren MacMillan" <[email protected]>
Cc: "lilypond-devel List" <[email protected]>
Sent: Wednesday, May 13, 2009 2:32 AM
Subject: [PATCH]Re: tempoMark - documentation and use
Patch attached. It has patches for three different files so I
just named it
after the one with the most changes, working.itely. Hope
there's no
confusion...
Jon
--
Jonathan Kulp
http://www.jonathankulp.com
_______________________________________________
lilypond-devel mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-devel
