windows BranchOne.txt edit
sqeszxcssssssssassserge branch 'branch_one' of https://github.com/getov/testgit into branch_one
Conflicts:
	BranchOne.txt