Hi, I am not very good in git: I pulled qtcreator master and got merge conflict in submodule src/shared/qbs (I assume due to new qbs version, right?) How do I solve this conflict?
Regards, Jochen _______________________________________________ Qt-creator mailing list [email protected] http://lists.qt-project.org/mailman/listinfo/qt-creator
