Unity

Code review comment for lp:~3v1n0/unity/lockscreen-power-keys

  1. lockscreen-power-keys
  2. Merge into trunk
Revision history for this message
Stephen M. Webb (bregma) wrote :

Merge conflicts when attempting to merge to trunk.

Text conflict in lockscreen/LockScreenController.cpp
Text conflict in shutdown/SessionView.cpp
2 conflicts encountered.

review: Needs Fixing

« Back to merge proposal