Parcourir la source

chore: fix merge conflict in test sample

sschmid il y a 4 ans
Parent
commit
83cc64e726
1 fichiers modifiés avec 0 ajouts et 4 suppressions
  1. 0 4
      test/data/test_rehearsal_marks_bolivia.musicxml

+ 0 - 4
test/data/test_rehearsal_marks_bolivia.musicxml

@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 3.1 Partwise//EN" "http://www.musicxml.org/dtds/partwise.dtd">
 <score-partwise>
-<<<<<<< HEAD
-  <movement-title>Bolivia</movement-title>
-=======
   <movement-title>Test - Rehearsal Marks Bolivia</movement-title>
->>>>>>> osmd-public/develop
   <identification>
     <creator type="composer">Cedar Extra Name Walton</creator>
     <creator type="lyricist">Up Tempo Swing</creator>