Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: openmrs/openmrs-core
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: abe78c566c0e
Choose a base ref
...
head repository: openmrs/openmrs-core
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6375e182f290
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on May 16, 2013

  1. fixes to trunk 3991

    @surangak
    surangak committed May 16, 2013
    Copy the full SHA
    106cab3 View commit details

Commits on May 21, 2013

  1. Merge pull request #316 from surangak/TRUNK-3991 

    fixes to trunk 3991
    @dkayiwa
    dkayiwa committed May 21, 2013
    Copy the full SHA
    6375e18 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 webapp/src/main/webapp/WEB-INF/messages.properties
2 changes: 1 addition & 1 deletion webapp/src/main/webapp/WEB-INF/messages.properties
View file
Original file line number Diff line number Diff line change
@@ -1446,7 +1446,7 @@ Patient.merge.find=Find Patients to Merge
Patient.merge.search_on=Search on
Patient.merge.minimum=Choose a minimum of two attributes
Patient.merge.title=Merge Patients
Patient.merge.select=Select a pair of patients to continue
Patient.merge.select=Select two or more patients to continue
Patient.merge.warning=Merging patients is something that should not be taken lightly. It is <b>extremely</b> difficult to undo and quite potentially <i>impossible</i>. <br/><br/>Continue only if you are <u>100% positive</u> these are the same patients.
Patient.merge.preferred=Preferred
Patient.merge.notPreferred=Not Preferred