There are conflict markers in the diff against trunk for this merge request.
Those should be resolved.
Merging trunk into the the branch and resolve conflicts before pushing branch again
SYNONYM_STEM_X_CONCAT_SUBMITTED_WORDS should not be removed. Once you merge trunk and priya's schema updates, the test will pass for this.
« Back to merge proposal
There are conflict markers in the diff against trunk for this merge request.
Those should be resolved.
Merging trunk into the the branch and resolve conflicts before pushing branch again
SYNONYM_ STEM_X_ CONCAT_ SUBMITTED_ WORDS should not be removed. Once you merge trunk and priya's schema updates, the test will pass for this.