Fix merge conflicts

Author: pieter-edelman-nictiz

output/STU3/eOverdracht4-1/MEO/Test/Sending-XIS/Scenario1-1e-phase2-handoff-json.xml

@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<<<<<<<< HEAD:output/R4/MP9-3-0-0-beta/MedMij/Cert/MedicationData/Serving-System-MedMij/MedicationAgreement/MA-Scenario0-4-json.xml
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-ma-Serve-0-4-MedMij-json"/>
-========
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.1e-handoff-json"/>
->>>>>>>> main:output/STU3/eOverdracht4-1/MEO/Test/Sending-XIS/Scenario1-1e-phase2-handoff-json.xml
    <meta>
       <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
    </meta>
@@ -105,17 +100,6 @@
                <system value="http://hl7.org/fhir/restful-interaction"/>
                <code value="create"/>
             </type>
-<<<<<<<< HEAD:output/R4/MP9-3-0-0-beta/MedMij/Cert/MedicationData/Serving-System-MedMij/MedicationAgreement/MA-Scenario0-4-json.xml
-            <resource value="MedicationRequest"/>
-            <description value="Test server to serve MedicationRequest resource(s) representing MP9 building block MedicationAgreement"/>
-            <accept value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|33633005&amp;period-of-use=ge${DATE, T, D,-7}&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:reason&amp;_include=MedicationRequest:next-practitioner&amp;_include=MedicationRequest:requester&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-========
             <resource value="Resource"/>
             <label value="Await notification from sending XIS"/>
             <description value="The sending XIS should notify the receiving XIS by POSTing and empty body on the endpoint specified here."/>
@@ -130,22 +114,14 @@
    <test>
       <name value="Serve 'in-progress' Task"/>
       <description value="The sending XIS should serve the Task specified in the notification."/>
->>>>>>>> main:output/STU3/eOverdracht4-1/MEO/Test/Sending-XIS/Scenario1-1e-phase2-handoff-json.xml
       <action>
          <operation>
             <type>
                <system value="http://hl7.org/fhir/restful-interaction"/>
-<<<<<<<< HEAD:output/R4/MP9-3-0-0-beta/MedMij/Cert/MedicationData/Serving-System-MedMij/MedicationAgreement/MA-Scenario0-4-json.xml
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test XIS server to serve MedicationRequest resource(s) representing MP9 building block MedicationAgreement"/>
-========
                <code value="read"/>
             </type>
             <resource value="Task"/>
             <description value="Test server to serve Task resource."/>
->>>>>>>> main:output/STU3/eOverdracht4-1/MEO/Test/Sending-XIS/Scenario1-1e-phase2-handoff-json.xml
             <accept value="json"/>
             <destination value="1"/>
             <encodeRequestUrl value="true"/>

output/STU3/eOverdracht4-1/MEO/Test/Sending-XIS/Scenario1-1e-phase2-handoff-xml.xml

@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<<<<<<<< HEAD:output/R4/MP9-3-0-0-beta/MedMij/Cert/MedicationData/Serving-System-MedMij/MedicationAgreement/MA-Scenario0-4-xml.xml
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-ma-Serve-0-4-MedMij-xml"/>
-========
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.1e-handoff-xml"/>
->>>>>>>> main:output/STU3/eOverdracht4-1/MEO/Test/Sending-XIS/Scenario1-1e-phase2-handoff-xml.xml
    <meta>
       <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
    </meta>
@@ -105,17 +100,6 @@
                <system value="http://hl7.org/fhir/restful-interaction"/>
                <code value="create"/>
             </type>
-<<<<<<<< HEAD:output/R4/MP9-3-0-0-beta/MedMij/Cert/MedicationData/Serving-System-MedMij/MedicationAgreement/MA-Scenario0-4-xml.xml
-            <resource value="MedicationRequest"/>
-            <description value="Test server to serve MedicationRequest resource(s) representing MP9 building block MedicationAgreement"/>
-            <accept value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|33633005&amp;period-of-use=ge${DATE, T, D,-7}&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:reason&amp;_include=MedicationRequest:next-practitioner&amp;_include=MedicationRequest:requester&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-========
             <resource value="Resource"/>
             <label value="Await notification from sending XIS"/>
             <description value="The sending XIS should notify the receiving XIS by POSTing and empty body on the endpoint specified here."/>
@@ -130,22 +114,14 @@
    <test>
       <name value="Serve 'in-progress' Task"/>
       <description value="The sending XIS should serve the Task specified in the notification."/>
->>>>>>>> main:output/STU3/eOverdracht4-1/MEO/Test/Sending-XIS/Scenario1-1e-phase2-handoff-xml.xml
       <action>
          <operation>
             <type>
                <system value="http://hl7.org/fhir/restful-interaction"/>
-<<<<<<<< HEAD:output/R4/MP9-3-0-0-beta/MedMij/Cert/MedicationData/Serving-System-MedMij/MedicationAgreement/MA-Scenario0-4-xml.xml
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test XIS server to serve MedicationRequest resource(s) representing MP9 building block MedicationAgreement"/>
-========
                <code value="read"/>
             </type>
             <resource value="Task"/>
             <description value="Test server to serve Task resource."/>
->>>>>>>> main:output/STU3/eOverdracht4-1/MEO/Test/Sending-XIS/Scenario1-1e-phase2-handoff-xml.xml
             <accept value="xml"/>
             <destination value="1"/>
             <encodeRequestUrl value="true"/>