Trunk-5650:Add parent order group to order group #3068
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Can you look into these merge conflicts? |
|
@dkayiwa i have resolved the merge conflicts |
|
Are these the only changes required by the ticket? |
|
@dkayiwa yes the changes are required by the ticket because changeset needs to be in a liquibase-update-to-2.4.xml file instead of liquibase-update-to-2.3.xml |
|
Did you remove this changeset from the |
|
yes @dkayiwa, as you had earlier on requested in the comment on the ticket proceeding after the merge |
|
@gitcliff are you sure that you did so? |
|
@dkayiwa i have fixed it |
prathamesh-mutkure
pushed a commit
to prathamesh-mutkure/openmrs-core
that referenced
this pull request
Dec 25, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
link:https://issues.openmrs.org/browse/TRUNK-5650