resolve merge

[lilypond.git] / input / regression / grace-end.ly

diff --git a/input/regression/grace-end.ly b/input/regression/grace-end.ly
index 1155d98921467abf9ee9a6ab13cf3c3b858d2ac8..9beaad1ee1f8ed48ba55251328abe6138dd5d8d8 100644 (file)
--- a/input/regression/grace-end.ly
+++ b/input/regression/grace-end.ly
@@ -1,24 +1,12 @@
+\version "2.14.0"
 
-\version "2.12.0"
-\header {
+#(ly:set-option 'warning-as-error #f)
 
+\header {
   texidoc="@cindex Grace End
  Grace notes after the last note do not confuse the timing code."
-
-
-}
-
-\layout {
-  ragged-right = ##t
 }
 
-
-
 \context Voice \relative c' {
-  
-  c4 \grace {  d16[ d16] }
-  
+  c4 \grace { d16[ d16] }
 }
-  
-
-