resolve merge

[lilypond.git] / input / regression / beam-concave.ly

diff --git a/input/regression/beam-concave.ly b/input/regression/beam-concave.ly
index 093f30d918dd1819072b10ff8be7997fb69b2d3c..d47a9b1cbbdb18c3c414e81db8be52737992b2bc 100644 (file)
--- a/input/regression/beam-concave.ly
+++ b/input/regression/beam-concave.ly
@@ -1,4 +1,4 @@
-\version "2.12.0"
+\version "2.14.0"
 \header{
 
   texidoc = "Fully concave beams should be horizontal. Informally spoken,
@@ -6,7 +6,7 @@
   beam. If an up-beam has high notes on its center stems, then we call
   it concave.
 
-  If a beam is fails a test, the desired slope is printed next to it.
+  If a beam fails a test, the desired slope is printed next to it.
 
 " 
 }