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" <jonlancek...@gmail.com>
To: "Kieren MacMillan" <kieren_macmil...@sympatico.ca>
Cc: "lilypond-devel List" <lilypond-devel@gnu.org>
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
lilypond-devel@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-devel

Reply via email to