del one

del one
Merge branch 'refs/heads/new-branch'

Conflicts:
	work.txt
aaa

aaa
del

del