resolve merge

[lilypond.git] / input / regression / spacing-to-empty-barline.ly

diff --git a/input/regression/spacing-to-empty-barline.ly b/input/regression/spacing-to-empty-barline.ly
index af26d8e5ca450f656b5ee70b3abbd1eacaafe732..17091dd5109446c4575dc9fd29361d498b89ac3c 100644 (file)
--- a/input/regression/spacing-to-empty-barline.ly
+++ b/input/regression/spacing-to-empty-barline.ly
@@ -1,4 +1,4 @@
-\version "2.12.0"
+\version "2.14.0"
 
 \header {
   texidoc = "An empty barline does not confuse the spacing engine too much.
@@ -17,11 +17,8 @@ The two scores should look approximately the same."
     \type "Engraver_group"
     \consists "Output_property_engraver"
     \consists "Bar_engraver"
-    \consists "Skip_event_swallow_translator"
     \consists "Axis_group_engraver"
 
-    \override VerticalAxisGroup #'Y-extent = ##f
-    \override VerticalAxisGroup #'minimum-Y-extent = ##f
     \override BarLine #'transparent = ##t
   }
 }