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

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

diff --git a/input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ly b/input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ly
index b9447a4d2f02645c4a48f3788ea8ec4b6b028371..e6db7e0634f22a501e04d19ed1d30c664226b2e8 100644 (file)
--- a/input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ly
+++ b/input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ly
@@ -48,21 +48,13 @@ rondo = \notes      \relative c'
        R2.*7
        \mark  "A"
        c4.\p \grace {
-<<<<<<< mozart-hrn3-rondo.ly
-  \override Stem  #'stroke-style = #"grace"
-=======
   \override Stem   #'stroke-style = #"grace"
->>>>>>> 1.15
    e16( 
   \revert Stem #'stroke-style }
   d8[) c d]
        c4 r8 r4 r8
        e4. \grace {
-<<<<<<< mozart-hrn3-rondo.ly
-  \override Stem  #'stroke-style = #"grace"
-=======
   \override Stem   #'stroke-style = #"grace"
->>>>>>> 1.15
    g16( 
   \revert Stem #'stroke-style }
   f8[) e f]
@@ -180,11 +172,7 @@ rondo = \notes     \relative c'
        
        << d2.(\trill
          { s2  \grace {
-<<<<<<< mozart-hrn3-rondo.ly
-  \override Stem  #'stroke-style = #"grace"
-=======
   \override Stem   #'stroke-style = #"grace"
->>>>>>> 1.15
      c16[ d] 
   \revert Stem #'stroke-style }
  } >>