Unity 8

Code review comment for lp:~mterry/unity8/relock-during-tutorial

  1. relock-during-tutorial
  2. Merge into trunk
Revision history for this message
Albert Astals Cid (aacid) wrote :

Text conflict in qml/Greeter/Greeter.qml
Text conflict in qml/Tutorial/TutorialContent.qml
Text conflict in qml/Tutorial/TutorialLeft.qml
Contents conflict in qml/Tutorial/TutorialLeftFinish.qml
Text conflict in tests/qmltests/Tutorial/tst_Tutorial.qml
5 conflicts encountered.

« Back to merge proposal