Leo Famulari writes:

> I've attached the file that results after I resolve the conflict. Can
> you tell me if it's doing the right thing?

Yes that looks fine.  Thanks,
Greetings, Jan

-- 
Jan Nieuwenhuizen <jann...@gnu.org> | GNU LilyPond http://lilypond.org
Freelance IT http://JoyofSource.com | Avatar®  http://AvatarAcademy.nl  

Reply via email to