"src/plugins/cpptools/cpphighlightingsupport.h" did not exist on "54f4fba003c5bb60ed747552e8b7d4981fa2ecbd"
-
Lasse Holmstedt authored
Conflicts: src/plugins/qmlprojectmanager/qmlproject.cpp src/plugins/qmlprojectmanager/qmlproject.h
Lasse Holmstedt authoredConflicts: src/plugins/qmlprojectmanager/qmlproject.cpp src/plugins/qmlprojectmanager/qmlproject.h