Merge pull request #2 from om-sv/m2

1
45
Merge branch 'master' of https://github.com/om-sv/mytest.git

Conflicts:
	С„Р°Р№Р»-1.txt
Signed-off-by: om-sv <om-sv2@mail.ru>
Signed-off-by: om-sv <om-sv2@mail.ru>
Update файл-1.txt
Update файл-1.txt
Revert "Update файл-1.txt"

This reverts commit d24aeb311bfdfbcd2402ade7934887a5a25c9eb9.
Revert "Revert "Update файл-1.txt""

This reverts commit 12e0262a706a242f59e4cb4e9eb803c44aaf3092.
123
Merge branch 'master' of https://github.com/om-sv/mytest.git

Conflicts:
	С„Р°Р№Р»-1.txt
Merge pull request #3 from om-sv/master

111