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

[lilypond.git] / input / mutopia / J.S.Bach / wtk1-fugue2.ly

diff --git a/input/mutopia/J.S.Bach/wtk1-fugue2.ly b/input/mutopia/J.S.Bach/wtk1-fugue2.ly
index 8f3c772f864ffd028acbfd7409a84b73cc82541f..db7a991564305791cd0dea28bf27ea05620cb05d 100644 (file)
--- a/input/mutopia/J.S.Bach/wtk1-fugue2.ly
+++ b/input/mutopia/J.S.Bach/wtk1-fugue2.ly
@@ -192,11 +192,7 @@ bassdux = \context Voice=three \notes \relative c' {
 \score {
  
     \notes \context PianoStaff << 
-<<<<<<< wtk1-fugue2.ly
         \override Score.TimeSignature  #'style = #'C
-=======
-        \override Score.TimeSignature   #'style = #'C
->>>>>>> 1.15
        \context Staff = treble <<
            \key c \minor
            \dux