Build: #377 was successful Changes by Wyclif Luyima
Code commits
Git
-
Wyclif Luyima 0991b32f5b47dfd18c43eae5d883c9de3703f70c
Duration term for minutes and months conflict - TRUNK-4491
Follow up to rename constants for snomed codes and hl7 code - TRUNK-4491
Follow up - TRUNK-4491
Conflicts:
api/src/main/resources/liquibase-update-to-latest.xml
api/src/test/resources/org/openmrs/include/standardTestDataset.xml- api/src/main/java/org/openmrs/ConceptMapType.java (version 0991b32f5b47dfd18c43eae5d883c9de3703f70c)
- api/src/main/java/org/openmrs/Duration.java (version 0991b32f5b47dfd18c43eae5d883c9de3703f70c)
- api/src/main/java/org/openmrs/ISO8601Duration.java (version 0991b32f5b47dfd18c43eae5d883c9de3703f70c)
- api/src/main/java/org/openmrs/SimpleDosingInstructions.java (version 0991b32f5b47dfd18c43eae5d883c9de3703f70c)
- api/src/main/java/org/openmrs/validator/DrugOrderValidator.java (version 0991b32f5b47dfd18c43eae5d883c9de3703f70c)
- api/src/main/resources/liquibase-update-to-latest.xml (version 0991b32f5b47dfd18c43eae5d883c9de3703f70c)
- api/src/test/java/org/openmrs/DurationTest.java (version 0991b32f5b47dfd18c43eae5d883c9de3703f70c)
- api/src/test/java/org/openmrs/ISO8601DurationTest.java (version 0991b32f5b47dfd18c43eae5d883c9de3703f70c)
- api/src/test/java/org/openmrs/SimpleDosingInstructionsTest.java (version 0991b32f5b47dfd18c43eae5d883c9de3703f70c)
- api/src/test/java/org/openmrs/validator/DrugOrderValidatorTest.java (version 0991b32f5b47dfd18c43eae5d883c9de3703f70c)
- api/src/test/resources/org/openmrs/api/include/OrderServiceTest-drugOrderAutoExpireDate.xml (version 0991b32f5b47dfd18c43eae5d883c9de3703f70c)
- api/src/test/resources/org/openmrs/include/standardTestDataset.xml (version 0991b32f5b47dfd18c43eae5d883c9de3703f70c)
- webapp/src/main/webapp/WEB-INF/messages.properties (version 0991b32f5b47dfd18c43eae5d883c9de3703f70c)
