/vorkurs_merging

working repository to learn how to solve merge conflicts

This repository is not active