Due to the latest changes in trunk, there are now conflicts when merging this branch. Can you please resolve them (by merging trunk back into your branch)?
« Back to merge proposal
Due to the latest changes in trunk, there are now conflicts when merging this branch. Can you please resolve them (by merging trunk back into your branch)?