Review: Needs Fixing Text conflict in src/ubuntumirclient/window.cpp 1 conflicts encountered. -- https://code.launchpad.net/~gerboland/qtubuntu/eglconvenience-retry/+merge/298114 Your team Ubuntu Phablet Team is subscribed to branch lp:qtubuntu.