fixed mistake in merge

truonghatsts · Mar 11, 2014 · 8032aa1 · 8032aa1
1 parent f56e1a2
commit 8032aa1
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/api/src/test/resources/standardAppointmentTestDataset.xml b/api/src/test/resources/standardAppointmentTestDataset.xml
@@ -37,6 +37,7 @@
     <appointmentscheduling_time_slot time_slot_id="6" appointment_block_id="1" start_date="2005-01-02 00:00:00.0" end_date="2005-01-02 01:00:00.0" uuid="c0c579b0-8e59-401d-8a4a-976a0b183609" date_created="2005-01-01 00:00:00.0" voided="false" creator="1" />
     <appointmentscheduling_time_slot time_slot_id="7" appointment_block_id="1" start_date="2005-01-03 00:00:00.0" end_date="2005-01-03 00:30:00.0" uuid="c0c579b0-8e59-401d-8a4a-976a0b1836010" date_created="2005-01-01 00:00:00.0" voided="false" creator="1" />
     <appointmentscheduling_time_slot time_slot_id="8" appointment_block_id="4" start_date="2014-01-02 00:00:00.0" end_date="2014-01-02 12:00:00.0" uuid="c0c579b0-8e59-401d-8a4a-976a0b1836011" date_created="2014-01-02 00:00:00.0" voided="false" creator="1" />
+    <appointmentscheduling_time_slot time_slot_id="9" appointment_block_id="5" start_date="2014-01-02 00:00:00.0" end_date="2014-01-02 12:00:00.0" uuid="c0c579b0-8e59-401d-8a4a-976a0b1836012" date_created="2014-01-02 00:00:00.0" voided="false" creator="1" />
 
     <visit visit_id="1" patient_id="2" date_started="2005-01-01 00:00:00.0" uuid="c0c579b0-8e59-401d-8a4a-976a0b183600" date_created="2005-01-01 00:00:00.0" voided="false" creator="1" />
 	<patient patient_id="1" creator="1" date_created="2005-01-01 00:00:00.0" voided="false"/>