resolve merge

[lilypond.git] / input / regression / utf-8-mixed-text.ly

diff --git a/input/regression/utf-8-mixed-text.ly b/input/regression/utf-8-mixed-text.ly
index 47e9f7513b8556e444c6cf0afa402eea9ae55cc3..eb6d00446b381eb60fec54001ea299f09b8756c4 100644 (file)
--- a/input/regression/utf-8-mixed-text.ly
+++ b/input/regression/utf-8-mixed-text.ly
@@ -5,6 +5,6 @@
   
 }
 
-\version "2.12.0"
+\version "2.14.0"
 
-\markup  { "Здравствуйт Hallo" }
+\markup { "Здравствуйте Hallo" }