Resolve conflict

[lilypond.git] / input / regression / markup-arrows.ly

diff --git a/input/regression/markup-arrows.ly b/input/regression/markup-arrows.ly
index 51a4c37004b17637cb60567a94f040440d9c25b2..c95a5571eec7dab124d3ff4a178cb5c98a267133 100644 (file)
--- a/input/regression/markup-arrows.ly
+++ b/input/regression/markup-arrows.ly
@@ -3,23 +3,27 @@
   texidoc = "The feta font has arrow heads"
 }
 
-
 \lyrics {
   \markup {
 
-    filled
-    
-    \arrow-head #0 #1 ##t
-    \arrow-head #0 #-1 ##t
-    \arrow-head #1 #1 ##t
-    \arrow-head #1 #-1 ##t
+    \arrow-head #X #RIGHT ##t
+    " "
+    \arrow-head #X #LEFT  ##t
+    " "
+    \arrow-head #Y #RIGHT ##t
+    " "
+    \arrow-head #Y #LEFT  ##t
+    " "
 
     
-    \arrow-head #0 #1 ##f
-    \arrow-head #0 #-1 ##f
-    \arrow-head #1 #1 ##f
-    \arrow-head #1 #-1 ##f
+    \arrow-head #X #RIGHT ##f
+    " "
+    \arrow-head #X #LEFT  ##f
+    " "
+    \arrow-head #Y #RIGHT ##f
+    " "
+    \arrow-head #Y #LEFT  ##f
   }
 }
 
-\version "2.7.4"
+\version "2.11.51"