resolve merge

[lilypond.git] / input / regression / musicxml / 23c-Tuplet-Display-NonStandard.xml

diff --git a/input/regression/musicxml/23c-Tuplet-Display-NonStandard.xml b/input/regression/musicxml/23c-Tuplet-Display-NonStandard.xml
index 984292ff38685cec15cfa0686c15e20d0126e22f..c0949e4c43bc133e06df39adbf3f47f5db853a41 100644 (file)
--- a/input/regression/musicxml/23c-Tuplet-Display-NonStandard.xml
+++ b/input/regression/musicxml/23c-Tuplet-Display-NonStandard.xml
@@ -568,10 +568,12 @@
           <tuplet bracket="yes" show-number="both" show-type="both" number="1" type="start">
             <tuplet-actual>
               <tuplet-number>7</tuplet-number>
+              <tuplet-type>eighth</tuplet-type>
               <tuplet-dot/>
             </tuplet-actual>
             <tuplet-normal>
               <tuplet-number>5</tuplet-number>
+              <tuplet-type>breve</tuplet-type>
             </tuplet-normal>
           </tuplet>
         </notations>