conflict merge.

diff --git a/python/convertrules.py b/python/convertrules.py
index 40a8300e730d252f19c75d14533443346581145e..995b2ea3b0c260cd58bbd4b199388a6ca335432a 100644 (file)
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -2632,7 +2632,8 @@ def conv (str):
     str = re.sub (r"minimumVerticalExtent",
                  r"\\override VerticalAxisGroup #'minimum-Y-extent",
                  str)
-
+    str = re.sub (r"\\set ([a-zA-Z]*\.?)verticalExtent",
+                 r"\\override \1VerticalAxisGroup")
     return str
 
 conversions.append (((2, 7, 14), conv,