Conflict adding file tests/plugins/Dash/cardcreator/6.res. Moved existing file to tests/plugins/Dash/cardcreator/6.res.moved. Conflict adding file tests/plugins/Dash/cardcreator/6.tst. Moved existing file to tests/plugins/Dash/cardcreator/6.tst.moved. 2 conflicts encountered.
« Back to merge proposal
Conflict adding file tests/plugins/ Dash/cardcreato r/6.res. Moved existing file to tests/plugins/ Dash/cardcreato r/6.res. moved. Dash/cardcreato r/6.tst. Moved existing file to tests/plugins/ Dash/cardcreato r/6.tst. moved.
Conflict adding file tests/plugins/
2 conflicts encountered.