a
a
df
Merge branch 'branch'
yt
Merge branch 'branch'

Conflicts:
	projeto/Novo Documento de Texto.txt