Attempt to merge lp:~canonical-isd-hackers/canonical-identity-provider/redirect-url into lp:canonical-identity-provider failed due to merge conflicts:
text conflict in identityprovider/views/ui.py
« Back to merge proposal
Attempt to merge lp:~canonical-isd-hackers/canonical-identity-provider/redirect-url into lp:canonical-identity-provider failed due to merge conflicts:
text conflict in identityprovide r/views/ ui.py