> Conflict in: > > Text conflict in ubuntuone_installer/gui/qt/utils/windows.py > 1 conflicts encountered.
Fixed
« Back to merge proposal
> Conflict in: installer/ gui/qt/ utils/windows. py
>
> Text conflict in ubuntuone_
> 1 conflicts encountered.
Fixed