repo2
pull, commit
Merge branch 'master' of https://github.com/ErikPGJ/test

Conflicts:
	repo1.txt

qweqwe