arquivos de teste
qqqqqqqqqq
agora sim.
volta para o original
aaa
aa
tes
ffdsds
Merge branch 'master' into v2

Conflicts:
	bora.txt
teste
dsadsa
aaa
aaa
v2
aa
master
Merge branch 'master' into v2
dsdaas
aaa
Merge branch 'master' into v2

Conflicts:
	bora.txt