Fui obrigado a dar o Commit :(
Merge remote-tracking branch 'origin/master'

Conflicts:
	Server/DFSServer/nbproject/project.properties