resolve merge

[lilypond.git] / input / regression / beam-beat-grouping.ly

diff --git a/input/regression/beam-beat-grouping.ly b/input/regression/beam-beat-grouping.ly
index e3af9219b52c7c851e42343dfdf0f43b2f86f18f..508f20dbfeadb62390744ea5fd5e89e2cbd58add 100644 (file)
--- a/input/regression/beam-beat-grouping.ly
+++ b/input/regression/beam-beat-grouping.ly
@@ -1,18 +1,19 @@
 \header {
 
-  texidoc = "Beaming patterns obey the @code{beatGrouping} property. "
+  texidoc = "Default beaming patterns can be set for the current time
+signature. "
   }
 
 \layout {
   ragged-right = ##t
   }
-\version "2.12.0"
+\version "2.14.0"
 
 
 \relative c'' {
   \time 5/16
-  \set beatGrouping = #'(2 3)
+  \set beatStructure = #'(2 3)
   c8[^"(2+3)" c16 c8]
-  \set beatGrouping = #'(3 2)
+  \set beatStructure = #'(3 2)
   c8[^"(3+2)" c16 c8]
 }