Text conflict in src/ubuntumirclient/qmirclientwindow.cpp 1 conflicts encountered. -- https://code.launchpad.net/~fboucault/qtubuntu/fix_panel_hack_low_chrome/+merge/292502 Your team Ubuntu Phablet Team is subscribed to branch lp:qtubuntu.