Attempt to merge into lp:ubuntuone-windows-installer failed due to conflicts:
text conflict in data/qt/setup_account.ui text conflict in ubuntuone_installer/gui/qt/gui.py text conflict in ubuntuone_installer/gui/qt/tests/test_gui.py
« Back to merge proposal
Attempt to merge into lp:ubuntuone-windows-installer failed due to conflicts:
text conflict in data/qt/ setup_account. ui installer/ gui/qt/ gui.py installer/ gui/qt/ tests/test_ gui.py
text conflict in ubuntuone_
text conflict in ubuntuone_