resolve merge

[lilypond.git] / ly / Welcome_to_LilyPond.ly

diff --git a/ly/Welcome_to_LilyPond.ly b/ly/Welcome_to_LilyPond.ly
index 2b0cec303ac6ec8193a75f12e1d5a2d01b113017..f90f3bce9f5e121032389df1f06096e34d5739bb 100644 (file)
--- a/ly/Welcome_to_LilyPond.ly
+++ b/ly/Welcome_to_LilyPond.ly
@@ -17,7 +17,7 @@ Now to take it for the first test run.
   4. To print or view the result, click on the newly produced file
      called
 
-        test.PDF
+        test.pdf
 
   5. If you see a piece of music with a scale, LilyPond is working properly.
 
@@ -32,7 +32,7 @@ Good luck with LilyPond!  Happy engraving.
 
 %}
 
-\version "2.12.0"  % necessary for upgrading to future LilyPond versions.
+\version "2.14.0"  % necessary for upgrading to future LilyPond versions.
 
 \header{
   title = "A scale in LilyPond"