resolve merge

[lilypond.git] / input / regression / keys.ly

diff --git a/input/regression/keys.ly b/input/regression/keys.ly
index 0a3fb7e8a586829fc67bdef3b68cbd9323c63c58..5fca40bf7d12a6bed4671f9101a58af3e17266a8 100644 (file)
--- a/input/regression/keys.ly
+++ b/input/regression/keys.ly
@@ -1,5 +1,5 @@
 
-\version "2.12.0"
+\version "2.14.0"
 \header{
 texidoc="
 Key signatures may appear on key changes, even without a barline.  
@@ -25,7 +25,7 @@ are created also on a clef change.
     \break
     \key bes \major % \major
     c2 \clef alto c2   \key d \major \clef treble c2
-    \set Staff.keySignature = #`((2 . ,SEMI-FLAT)  (6 . ,THREE-Q-SHARP) (4 . ,FLAT))
+    \set Staff.keySignature = #`((4 . ,FLAT) (6 . ,THREE-Q-SHARP) (2 . ,SEMI-FLAT))
     e2
 }