forked from qt-creator/qt-creator
Conflicts: src/plugins/beautifier/clangformat/clangformatsettings.cpp src/shared/qbs Change-Id: Ie614f036ef9529a3cae6366a9313eded988d725c
Conflicts: src/plugins/beautifier/clangformat/clangformatsettings.cpp src/shared/qbs Change-Id: Ie614f036ef9529a3cae6366a9313eded988d725c