There is a little conflict in
Text conflict in ubuntu_sso/qt/controllers.py 1 conflicts encountered.
« Back to merge proposal
There is a little conflict in
Text conflict in ubuntu_ sso/qt/ controllers. py
1 conflicts encountered.