Merge branch 'master' of C:\Users\Daniela\WebstormProjects\controle-vagas with conflicts.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
login