resolve merge

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

diff --git a/input/regression/accidental.ly b/input/regression/accidental.ly
index 587ef751fd7da6e925ce8eeb4747623dc9f82942..06ccc02b98188933deda1cf754f02c0e524a647b 100644 (file)
--- a/input/regression/accidental.ly
+++ b/input/regression/accidental.ly
@@ -1,10 +1,10 @@
 
-\version "2.12.0"
+\version "2.14.0"
 
 \header{
   texidoc="
 Accidentals work: the second note does not get a sharp. The third and
-fourth show forced and courtesy accidentals.
+fourth show forced and cautionary accidentals.
 "
 }