I take that back the conflict is just a bug in the other proposal. This one was fine.
« Back to merge proposal
I take that back the conflict is just a bug in the other proposal. This one was fine.