Ubuntu One Windows Installer

Code review comment for lp:~diegosarmentero/ubuntuone-windows-installer/network-detect

  1. network-detect
  2. Merge into trunk
Revision history for this message
Natalia Bidart (nataliabidart) wrote :

When trying to merged this branch into latest trunk, I get:

Warning: criss-cross merge encountered. See bzr help criss-cross.
 M ubuntuone_installer/gui/qt/tests/test_gui.py
Text conflict in ubuntuone_installer/gui/qt/tests/test_gui.py
1 conflicts encountered.

Can you please remove the criss-cross and resolve the conflict?

Thanks!!!

review: Needs Fixing

« Back to merge proposal