Text conflict in qml/Dash/GenericScopeView.qml Text conflict in tests/plugins/Dash/cardcreator/1.res Text conflict in tests/plugins/Dash/cardcreator/3.res Text conflict in tests/plugins/Dash/cardcreator/5.res 4 conflicts encountered.
« Back to merge proposal
Text conflict in qml/Dash/ GenericScopeVie w.qml Dash/cardcreato r/1.res Dash/cardcreato r/3.res Dash/cardcreato r/5.res
Text conflict in tests/plugins/
Text conflict in tests/plugins/
Text conflict in tests/plugins/
4 conflicts encountered.