Unity

Code review comment for lp:~bilalakhtar/unity/sd-card-stop-device-960910

  1. sd-card-stop-device-960910
  2. Merge into trunk
Revision history for this message
Unity Merger (unity-merger) wrote :

Attempt to merge into lp:unity failed due to conflicts:

text conflict in launcher/DeviceLauncherIcon.cpp
text conflict in launcher/DeviceLauncherIcon.h
text conflict in manual-tests/Launcher.txt

« Back to merge proposal