resolve merge

[lilypond.git] / input / regression / tablature-string-tunings.ly

diff --git a/input/regression/tablature-string-tunings.ly b/input/regression/tablature-string-tunings.ly
index d8f735e43594f1b716b9da0d77baee9ba1367aaa..0808e8d565f68d9950d356b79d9172e4642176b6 100644 (file)
--- a/input/regression/tablature-string-tunings.ly
+++ b/input/regression/tablature-string-tunings.ly
@@ -1,3 +1,5 @@
+\version "2.14.0"
+
 \header {
 
   texidoc = "For other tunings, it is sufficient to set
@@ -6,12 +8,13 @@
 
 }
 
-\version "2.12.0"
-
 
 \new TabStaff {
-  \set TabStaff.stringTunings = #'(5  10 15 20)
+  \set TabStaff.stringTunings = #`(,(ly:make-pitch 0 3 0)
+                                  ,(ly:make-pitch 0 5 SHARP)
+                                  ,(ly:make-pitch 1 1 SHARP)
+                                  ,(ly:make-pitch 1 4 SHARP))
   \relative c''  { c4 d e f }
 }
 
- 
+