* lily/rest.cc (polyphonic_offset_callback): new function. Do

[lilypond.git] / input / mutopia / W.A.Mozart / mozart-hrn3-romanze.ly

diff --git a/input/mutopia/W.A.Mozart/mozart-hrn3-romanze.ly b/input/mutopia/W.A.Mozart/mozart-hrn3-romanze.ly
index 0ddbe7a8fe0047ff0622bb7a10ba463da9bdea52..d0f1c6448876160c8efecbc5de4987aad00ab1b6 100644 (file)
--- a/input/mutopia/W.A.Mozart/mozart-hrn3-romanze.ly
+++ b/input/mutopia/W.A.Mozart/mozart-hrn3-romanze.ly
@@ -45,11 +45,7 @@ romanze = \notes \relative c' {
         c[ ( e) g g]  g[( f e  d)]
        c4(
        \grace {
-<<<<<<< mozart-hrn3-romanze.ly
-  \override Stem  #'stroke-style = #"grace"
-=======
   \override Stem   #'stroke-style = #"grace"
->>>>>>> 1.15
    \longgrace e16 \endlonggrace 
   \revert Stem #'stroke-style }
 
@@ -57,11 +53,7 @@ romanze = \notes \relative c' {
        \mark "C"
 
        %% this is a trick to get the sfp-s to align. 
-<<<<<<< mozart-hrn3-romanze.ly
-       \override Hairpin  #'transparent = ##t
-=======
        \override Hairpin   #'transparent = ##t
->>>>>>> 1.15
        des1\sfp \> 
        g,1\sfp\!  \> 
        c\sfp \!   \>