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