edited the repository, session 5

Woohoo! @patrick.gut , you've created our first merge conflict. Some merge conflicts can be resolved in GitLab, inside web browser. But not this one. You may need to follow the instructions when you click 'merge locally'... let me know if you need any help!

P.S. Note that your branch is 29 commits behind master -- you might want to update your fork to contain everything that current master does. This might get called, keeping your fork in sync. The following link has command line instructions for every OS:

https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/merging-an-upstream-repository-into-your-fork

mentioned in issue #27

closed