Übung2
Compare changes
Conflict: This file was added both in the source and target branches, but with different contents.
Ask someone with write access to resolve it.
.gitignore
0 → 100644
+ 19
− 0