The conflict remains. You need to merge the current trunk into your branch and fix it.
« Back to merge proposal
The conflict remains. You need to merge the current trunk into your branch and fix it.