[EP]{first test commit} test file
Merge remote-tracking branch 'remotes/origin/test-branch'
My First change
Merge remote-tracking branch 'origin/branchNewLine'
test
Revert "test"

This reverts commit 78b443874ab45e1bb56454684e57f6290852a815.
gitignore-file added
[JE]{init test} super testfile
Merge branch 'master' of https://github.com/manueljelinek/sw_test
Merge branch 'master' of https://github.com/manueljelinek/sw_test
[JE] {change test} testfile changed
[JE]{merge} testfile merge

Merge branch 'master' of https://github.com/manueljelinek/sw_test

Conflicts:
	testfile.txt