forked from qt-creator/qt-creator
Conflicts: src/plugins/qmljseditor/qmljseditorsettings.cpp Change-Id: I443424afdfe48cdfc3d083d8e91335e937fcfdb6
28 KiB
28 KiB
Conflicts: src/plugins/qmljseditor/qmljseditorsettings.cpp Change-Id: I443424afdfe48cdfc3d083d8e91335e937fcfdb6