Build #308

Plan branch:

Build: #308 was successful Run by child build REFAPP-OMODDISTRO

Code commits

Git

  • Wyclif Luyima

    Wyclif Luyima db12ad7acba1311bed4c5f4e2430a227d3492786

    deleted patientRegimen patientRegimenCurrent and patientRegimenCompleted jsp pages and DrugSetItem class
    Conflicts:
            webapp/src/main/webapp/WEB-INF/view/portlets/patientRegimen.jsp
            webapp/src/main/webapp/WEB-INF/view/portlets/patientRegimenCompleted.jsp
            webapp/src/main/webapp/WEB-INF/view/portlets/patientRegimenCurrent.jsp

    • web/src/main/java/org/openmrs/web/dwr/DrugSetItem.java (version db12ad7acba1311bed4c5f4e2430a227d3492786)
    • webapp/src/main/webapp/WEB-INF/dwr.xml (version db12ad7acba1311bed4c5f4e2430a227d3492786)
    • webapp/src/main/webapp/WEB-INF/view/portlets/patientRegimen.jsp (version db12ad7acba1311bed4c5f4e2430a227d3492786)
    • webapp/src/main/webapp/WEB-INF/view/portlets/patientRegimenCompleted.jsp (version db12ad7acba1311bed4c5f4e2430a227d3492786)
    • webapp/src/main/webapp/WEB-INF/view/portlets/patientRegimenCurrent.jsp (version db12ad7acba1311bed4c5f4e2430a227d3492786)