remover linha
Merge branch '20302809863b2452b7b96ae14e897b4511cacdb8'

Conflicts:
	meu_projeto.txt