Um, something's wacky with the diff. If you branch the code, you won't see those conflict markers.
« Back to merge proposal
Um, something's wacky with the diff. If you branch the code, you won't see those conflict markers.