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

[lilypond.git] / input / mutopia / J.S.Bach / bwv940.ly

diff --git a/input/mutopia/J.S.Bach/bwv940.ly b/input/mutopia/J.S.Bach/bwv940.ly
index eb4b751d3c8592be0bdb130b0f43b90dec9d0845..fd26dc6e3f1df83c980f4e156f9adbff58903dfe 100644 (file)
--- a/input/mutopia/J.S.Bach/bwv940.ly
+++ b/input/mutopia/J.S.Bach/bwv940.ly
@@ -116,11 +116,7 @@ four = \notes\relative c{
        a gis ~ gis16 gis fis e 
        \skip 4*1
        \change Staff=lower \stemDown
-<<<<<<< bwv940.ly
-       \override NoteColumn  #'horizontal-shift = #0
-=======
        \override NoteColumn   #'horizontal-shift = #0
->>>>>>> 1.7
        \stemUp\tieUp
        b2 a |
        g a4. gis16 a |