Open spfanzelt opened 4 years ago
👋Hi @spfanzelt, for this assignment, if you’d like to try again, please include a screenshot that shows you creating and then resolving a merge conflict.
Dear @arelia : See below all screenshots. I hope everything is no to your convenience :)