Auswahl bei der Suche
skdghsloizh
"#   (use ""git pull"" to merge the remote branch into yours)"
"#   (all conflicts fixed: run ""git rebase --continue"")"
"#   (use ""git reset HEAD <file>..."" to unstage)"
"#	modified:   olympic.db"
commit endlioch
Merge branch 'master' of https://github.com/FlamingCodes/OlympicsProject

Conflicts:
	olympic.db