README.md · master · Johannes.Kainz / git_tutorial · GitLab

Nov 05, 2018
3748c292
Merge branch 'master' into 'branch_conflict' · 3748c292
Johannes.Kainz authored Nov 05, 2018
```
# Conflicts:
#   README.md
```
3748c292
Merge branch 'master' into 'branch_conflict'
Johannes.Kainz authored Nov 05, 2018
```
# Conflicts:
#   README.md
```