resolve merge

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

diff --git a/input/regression/beam-feather.ly b/input/regression/beam-feather.ly
index cf40c01aaa3a59d9a961a8f9c4f1d067930f5136..038b0a582a7986ddc7bd79fc7a603a982cb965d1 100644 (file)
--- a/input/regression/beam-feather.ly
+++ b/input/regression/beam-feather.ly
@@ -1,12 +1,12 @@
 \header  {
 
   texidoc = "Specifying @code{grow-direction} on a beam, will cause
-  feathered beaming. The @code{\featherDurations} function can be used
+  feathered beaming. The @code{\\featherDurations} function can be used
   to adjust note durations."
   
 }
 
-\version "2.12.0"
+\version "2.14.0"
 
 \paper {
   ragged-right = ##t