forked from qt-creator/qt-creator
Conflicts: src/plugins/designer/formeditor.cpp src/plugins/git/gitplugin.cpp Change-Id: I554a844fab4c55249a00f394f9ba174c7548dbbe
Conflicts: src/plugins/designer/formeditor.cpp src/plugins/git/gitplugin.cpp Change-Id: I554a844fab4c55249a00f394f9ba174c7548dbbe