edit file dev
edit from master
Merge branch 'dev' of https://github.com/evolonm/test-repo

Conflicts:
	test.txt