2011/5/28 Carl Sorensen <c_soren...@byu.edu>: > The merge conflicts exist probably mostly because we have snippets listed at > both 2.13.6x and 2.15.0. I guess once a snippet is backported to 2.13.6x, > it should have the 2.13.6x in both stable/2.14 and master. I haven't done > that, so I guess it's my mess to clean up.
I think a file in two branches does not suffice to generate a conflict; some lines should be also different to. Anyway, glad to hear it is resolved now. -- Francisco Vila. Badajoz (Spain) www.paconet.org , www.csmbadajoz.com _______________________________________________ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
