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

[lilypond.git] / input / mutopia / J.S.Bach / baerenreiter-sarabande.ly

diff --git a/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly b/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly
index c9f299d83e4f6695ff3826fd3426df05a0e58ddc..273ea88be5b8a1a15ace5625d703c8b432a00cfc 100644 (file)
--- a/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly
+++ b/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly
@@ -121,14 +121,9 @@ sarabandeA =  \context Voice \notes \relative c {
   d'[ cis] |
   %%  d4 d,,2 |
   d4
-<<<<<<< baerenreiter-sarabande.ly
-  \override NoteHead  #'after-line-breaking-callback
-  = #(lambda (smob) (assert-system-count smob 6))
-=======
   \override NoteHead
     #'after-line-breaking-callback
  = #(lambda (smob) (assert-system-count smob 6))
->>>>>>> 1.30
   d,,2 |
 }