Code review comment for lp://staging/~canonical-platform-qa/unity8/fix1306340-deprecate_emulators

Revision history for this message
Albert Astals Cid (aacid) wrote :

Text conflict in debian/control
Text conflict in tests/autopilot/unity8/dash.py
Text conflict in tests/autopilot/unity8/process_helpers.py
Conflict: can't delete tests/autopilot/unity8/shell/emulators because it is not empty. Not deleting.
Conflict because tests/autopilot/unity8/shell/emulators is not versioned, but has versioned children. Versioned directory.
Contents conflict in tests/autopilot/unity8/shell/emulators/main_window.py
Text conflict in tests/autopilot/unity8/shell/tests/test_helpers.py
7 conflicts encountered.

review: Needs Fixing

« Back to merge proposal