resolve merge

[lilypond.git] / input / regression / musicxml / 32a-Notations.xml

diff --git a/input/regression/musicxml/32a-Notations.xml b/input/regression/musicxml/32a-Notations.xml
index 06be5dde21740cc73ade0403cd3f51fce2909ca7..ab92216ff21ac46e5833eae442cf172cba8e0fe7 100644 (file)
--- a/input/regression/musicxml/32a-Notations.xml
+++ b/input/regression/musicxml/32a-Notations.xml
@@ -471,7 +471,7 @@
             <wavy-line placement="below" type="start"/>
           </ornaments>
         </notations>
-        <lyric number="1"><syllabic>continue</syllabic><text>wavy</text></lyric>
+        <lyric number="1"><syllabic>middle</syllabic><text>wavy</text></lyric>
       </note>
       <note>
         <pitch>
@@ -533,7 +533,7 @@
         <voice>1</voice>
         <type>quarter</type>
         <notations>
-          <ornaments><tremolo/></ornaments>
+          <ornaments><tremolo>3</tremolo></ornaments>
         </notations>
         <lyric number="1"><text>trem.</text></lyric>
       </note>