ah, the conflicts are just in the diff view that launchpad creates, which is still unfortunate
« Back to merge proposal
ah, the conflicts are just in the diff view that launchpad creates, which is still unfortunate