Merge branch 'master' into lilypond/translation

[lilypond.git] / input / regression / collisions.ly

diff --git a/input/regression/collisions.ly b/input/regression/collisions.ly
index 7c9d6df14945b9a77a5e701c0ceb3b9815020e0c..e3e68163251dbfb390614e079c7ce1b4f8083a04 100644 (file)
--- a/input/regression/collisions.ly
+++ b/input/regression/collisions.ly
@@ -1,8 +1,8 @@
-\version "2.7.39"
+\version "2.12.0"
 \header{
   texidoc="
 In addition to normal collision rules, there is support for polyphony, 
-where the collosion are avoided by shifting middle voices horizontally.
+where the collisions are avoided by shifting middle voices horizontally.
 "
 }