added conflict.txt
Hoffentlich ein Konflikt!
initial
Merge pull request #3 from bsan/troloTOPIC

added conflict.txt
moar conflict plz
Von mir mehr...
fix develop-branch needs specified bey project-owner
Merge remote-tracking branch 'origin/develop' into Test1

Conflicts:
	conflict.txt
Merge pull request #2 from bsan/Test1

Hoffentlich ein Konflikt!
besser?
Merge branch 'develop' into testing-bsan

Conflicts:
	conflict.txt
Merge branch 'testing-bsan' into develop

Conflicts:
	conflict.txt
damn
damn
Merge pull request #5 from bsan/develop

Develop
merge OK!