resolve merge

[lilypond.git] / input / regression / note-head-solfa.ly

diff --git a/input/regression/note-head-solfa.ly b/input/regression/note-head-solfa.ly
index b4d24ca852036dd0df8d9975ec63c8307043a5db..e3ee1bd4851535562f47aabebb29b93c36ef062c 100644 (file)
--- a/input/regression/note-head-solfa.ly
+++ b/input/regression/note-head-solfa.ly
@@ -5,11 +5,11 @@ is adjusted according to the step of the scale, as measured relative
 to the @code{tonic} property."
 
 }
-\version "2.12.0"
+\version "2.14.0"
 
 fragment = {
   \key c \major
-  \set shapeNoteStyles = #'#(do re mi fa #f la ti)
+  \set shapeNoteStyles = #'#(do re mi fa sol la ti)
   c1 d e f g a b c d e f g a b c
   c,,2 d e f g a b c d e f g a b c
   c,,4 d e f g a b c d e f g a b c