Corrected!
Torsten added line
Ojoj
Merge branch 'master' of https://github.com/flarss/repo3.git
test and master stuff
test a.txt
Merge branch 'master' of https://github.com/flarss/repo3.git
git pull origin test
Merge branch 'master' of https://github.com/flarss/repo3
Merge branch 'test' of https://github.com/flarss/repo3 into test

Conflicts:
	a.txt
Merge branch 'test' of https://github.com/flarss/repo3 into test

Conflicts:
	a.txt
Merge branch 'master' of https://github.com/flarss/repo3
Merge branch 'test'

Conflicts:
	a.txt
BANANAS

Change-Id: I2a75a921ad5c93c12e422d1897dbeaa71125ba53
DO IT NOW