> Looks like you had a merge conflict that needs resolving.
Ok I didn't see the update upstream. Is everything fine now?
« Back to merge proposal
> Looks like you had a merge conflict that needs resolving.
Ok I didn't see the update upstream. Is everything fine now?