From 34151b33bf5a3ff37f4bd7eff54a9c9f9f57ff8d Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Sat, 28 Oct 2006 21:10:49 +0200
Subject: [PATCH] conflict merge.

---
 python/convertrules.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/python/convertrules.py b/python/convertrules.py
index 40a8300e73..995b2ea3b0 100644
--- 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,
-- 
2.39.5