On Thu, Feb 27, 2014 at 7:25 PM, Martin Jansa <martin.jansa at gmail.com> wrote: >> Conflicts: >> recipes-qt/qt5/qtbase.inc > > Please drop this oops. sorry. i messed up with my git aliases... and resent the same.. will fix