There seems to be a fresh conflict:
Text conflict in ubuntu_sso/qt/tests/test_setup_account.py 1 conflicts encountered.
« Back to merge proposal
There seems to be a fresh conflict:
Text conflict in ubuntu_ sso/qt/ tests/test_ setup_account. py
1 conflicts encountered.