resolve merge

[lilypond.git] / input / regression / spacing-rest.ly

diff --git a/input/regression/spacing-rest.ly b/input/regression/spacing-rest.ly
index a55f4cbaf1f0fbf0c540ade9eac244db6c571f07..4e6aabae5e28876773e65fa1fd11d9410f8d19b5 100644 (file)
--- a/input/regression/spacing-rest.ly
+++ b/input/regression/spacing-rest.ly
@@ -1,5 +1,5 @@
 
-\version "2.12.0"
+\version "2.14.0"
 \header {
   texidoc = "Rests get a little less space, since they are narrower.
 However, the quarter rest in feta font is relatively wide, causing this