Update Новый текстовый документ.txt
Merge remote-tracking branch 'origin/dev'

Conflicts:
	Новый текстовый документ.txt
Merge branch 'master' of https://github.com/semanser/1

Conflicts:
	Новый текстовый документ.txt