Well, I resubmitted the Merge, so what else can I say? A small merge conflict should be cleaned up during the merge.
« Back to merge proposal
Well, I resubmitted the Merge, so what else can I say? A small merge conflict should be cleaned up during the merge.