X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fmutopia%2FJ.S.Bach%2Fwtk1-fugue2.ly;h=db7a991564305791cd0dea28bf27ea05620cb05d;hb=fe1eb832e9e1e92e2bf98c33011465658192f033;hp=8f3c772f864ffd028acbfd7409a84b73cc82541f;hpb=ce2b62c770461e0a719aa0fd99499624917f4e79;p=lilypond.git

diff --git a/input/mutopia/J.S.Bach/wtk1-fugue2.ly b/input/mutopia/J.S.Bach/wtk1-fugue2.ly
index 8f3c772f86..db7a991564 100644
--- 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