Skip to content

think it fixed teh merge conflicts

rasmusth requested to merge mockBranchForMergeConflict into main

branch 39 had merge conflicts sdo resolved them in this branch to not doing a misstake and deleting the changes in the code with the conflict

Merge request reports