Doc - fixing a merge conflict.
Doc - fixing a merge conflict.

jonnor/qt-creator,xianian/qt-creator,syntheticpp/qt-creator,sandsmark/qtcreator-minimap,omniacreator/qtcreator,KDAB/KDAB-Creator,amyvmiwei/qt-creator,ostash/qt-creator-i18n-uk,richardmg/qtcreator,maui-packages/qt-creator,xianian/qt-creator,ostash/qt-creator-i18n-uk,enricoros/k-qt-creator-inspector,xianian/qt-creator,KDAB/KDAB-Creator,enricoros/k-qt-creator-inspector,malikcjm/qtcreator,martyone/sailfish-qtcreator,martyone/sailfish-qtcreator,danimo/qt-creator,AltarBeastiful/qt-creator,maui-packages/qt-creator,amyvmiwei/qt-creator,bakaiadam/collaborative_qt_creator,dmik/qt-creator-os2,richardmg/qtcreator,azat/qtcreator,malikcjm/qtcreator,danimo/qt-creator,xianian/qt-creator,farseerri/git_code,KDAB/KDAB-Creator,danimo/qt-creator,maui-packages/qt-creator,yinyunqiao/qtcreator,sandsmark/qtcreator-minimap,danimo/qt-creator,Distrotech/qtcreator,darksylinc/qt-creator,AltarBeastiful/qt-creator,omniacreator/qtcreator,dmik/qt-creator-os2,yinyunqiao/qtcreator,duythanhphan/qt-creator,yinyunqiao/qtcreator,azat/qtcreator,darksylinc/qt-creator,richardmg/qtcreator,danimo/qt-creator,kuba1/qtcreator,malikcjm/qtcreator,KDE/android-qt-creator,kuba1/qtcreator,hdweiss/qt-creator-visualizer,yinyunqiao/qtcreator,malikcjm/qtcreator,maui-packages/qt-creator,martyone/sailfish-qtcreator,enricoros/k-qt-creator-inspector,maui-packages/qt-creator,KDE/android-qt-creator,azat/qtcreator,duythanhphan/qt-creator,dmik/qt-creator-os2,martyone/sailfish-qtcreator,renatofilho/QtCreator,malikcjm/qtcreator,ostash/qt-creator-i18n-uk,jonnor/qt-creator,colede/qtcreator,KDE/android-qt-creator,farseerri/git_code,jonnor/qt-creator,hdweiss/qt-creator-visualizer,syntheticpp/qt-creator,Distrotech/qtcreator,kuba1/qtcreator,martyone/sailfish-qtcreator,richardmg/qtcreator,farseerri/git_code,colede/qtcreator,farseerri/git_code,AltarBeastiful/qt-creator,xianian/qt-creator,syntheticpp/qt-creator,pcacjr/qt-creator,KDE/android-qt-creator,bakaiadam/collaborative_qt_creator,bakaiadam/collaborative_qt_creator,danimo/qt-creator,malikcjm/qtcreator,xianian/qt-creator,renatofilho/QtCreator,hdweiss/qt-creator-visualizer,dmik/qt-creator-os2,azat/qtcreator,Distrotech/qtcreator,AltarBeastiful/qt-creator,kuba1/qtcreator,Distrotech/qtcreator,farseerri/git_code,maui-packages/qt-creator,Distrotech/qtcreator,amyvmiwei/qt-creator,yinyunqiao/qtcreator,darksylinc/qt-creator,KDAB/KDAB-Creator,richardmg/qtcreator,omniacreator/qtcreator,dmik/qt-creator-os2,amyvmiwei/qt-creator,pcacjr/qt-creator,AltarBeastiful/qt-creator,yinyunqiao/qtcreator,jonnor/qt-creator,syntheticpp/qt-creator,bakaiadam/collaborative_qt_creator,pcacjr/qt-creator,Distrotech/qtcreator,farseerri/git_code,duythanhphan/qt-creator,richardmg/qtcreator,sandsmark/qtcreator-minimap,martyone/sailfish-qtcreator,bakaiadam/collaborative_qt_creator,hdweiss/qt-creator-visualizer,AltarBeastiful/qt-creator,darksylinc/qt-creator,dmik/qt-creator-os2,kuba1/qtcreator,renatofilho/QtCreator,AltarBeastiful/qt-creator,hdweiss/qt-creator-visualizer,pcacjr/qt-creator,KDE/android-qt-creator,omniacreator/qtcreator,martyone/sailfish-qtcreator,KDE/android-qt-creator,syntheticpp/qt-creator,ostash/qt-creator-i18n-uk,sandsmark/qtcreator-minimap,KDE/android-qt-creator,renatofilho/QtCreator,KDE/android-qt-creator,malikcjm/qtcreator,renatofilho/QtCreator,syntheticpp/qt-creator,farseerri/git_code,xianian/qt-creator,colede/qtcreator,duythanhphan/qt-creator,bakaiadam/collaborative_qt_creator,kuba1/qtcreator,colede/qtcreator,amyvmiwei/qt-creator,martyone/sailfish-qtcreator,azat/qtcreator,sandsmark/qtcreator-minimap,ostash/qt-creator-i18n-uk,danimo/qt-creator,jonnor/qt-creator,darksylinc/qt-creator,maui-packages/qt-creator,omniacreator/qtcreator,omniacreator/qtcreator,enricoros/k-qt-creator-inspector,colede/qtcreator,farseerri/git_code,enricoros/k-qt-creator-inspector,danimo/qt-creator,darksylinc/qt-creator,yinyunqiao/qtcreator,hdweiss/qt-creator-visualizer,richardmg/qtcreator,kuba1/qtcreator,syntheticpp/qt-creator,pcacjr/qt-creator,renatofilho/QtCreator,darksylinc/qt-creator,duythanhphan/qt-creator,duythanhphan/qt-creator,colede/qtcreator,ostash/qt-creator-i18n-uk,Distrotech/qtcreator,amyvmiwei/qt-creator,KDAB/KDAB-Creator,duythanhphan/qt-creator,xianian/qt-creator,kuba1/qtcreator,kuba1/qtcreator,pcacjr/qt-creator,colede/qtcreator,sandsmark/qtcreator-minimap,azat/qtcreator,AltarBeastiful/qt-creator,enricoros/k-qt-creator-inspector,darksylinc/qt-creator,pcacjr/qt-creator,dmik/qt-creator-os2,ostash/qt-creator-i18n-uk,jonnor/qt-creator,danimo/qt-creator,amyvmiwei/qt-creator,omniacreator/qtcreator,enricoros/k-qt-creator-inspector,KDAB/KDAB-Creator,bakaiadam/collaborative_qt_creator,xianian/qt-creator,martyone/sailfish-qtcreator,amyvmiwei/qt-creator