> Text conflict in runtests.sh > Text conflict in tests/plugins/Ubuntu/Gestures/CMakeLists.txt > Text conflict in tests/qmltests/Components/CMakeLists.txt > 3 conflicts encountered.
Merged
« Back to merge proposal
> Text conflict in runtests.sh Ubuntu/ Gestures/ CMakeLists. txt Components/ CMakeLists. txt
> Text conflict in tests/plugins/
> Text conflict in tests/qmltests/
> 3 conflicts encountered.
Merged