GRUNT MASTER
teste1
teste1
teste1
teste1
Merge branch 'master' of C:\Users\willi_000\Desktop\Teste\dois\teste with conflicts.
teste1
Merge branch 'master' of C:\Users\willi_000\Desktop\Teste\dois\teste with conflicts.
Merge branch 'master' of C:\Users\willi_000\Desktop\Teste\dois\teste with conflicts.
Merge branch 'master' into dev

Conflicts:
	views/template.html