Unity

Code review comment for lp://qastaging/~3v1n0/unity/ap-launcher-authide-reveal

  1. ap-launcher-authide-reveal
  2. Merge into trunk
Revision history for this message
Martin Mrazik (mrazik) wrote :

It looks like there is a conflict:
+ bzr branch lp:unity work/trunk
Branched 2439 revisions.
+ cd work/trunk
+ bzr merge bzr+ssh://<email address hidden>/~3v1n0/unity/ap-launcher-authide-reveal
 M tests/autopilot/unity/emulators/launcher.py
Text conflict in tests/autopilot/unity/emulators/launcher.py

« Back to merge proposal