Merge remote-tracking branch 'origin/Felipe'
deletando projeto
del
ht
atualização master
Merge remote-tracking branch 'origin/Humberto'

Conflicts:
	application/config/config.php
remover nbprojetc
git ignore
removendo arquivos do master
git ignore
Merge remote-tracking branch 'origin/Humberto'

Conflicts:
	.gitignore
	application/controllers/administrador.php
	application/models/administrador_model.php
	application/views/administrador/alterarFederado.php
	application/views/administrador/incluirFederado.php
	application/views/administrador/sucessoAlteracaoFederado.php
	application/views/administrador/sucessoInclusaoFederado.php
remover dados
Merge remote-tracking branch 'refs/remotes/origin/Humberto' into master-2

Conflicts:
	.gitignore
Merge remote-tracking branch 'origin/Felipe'

Conflicts:
	.htaccess
	application/config/autoload.php
	application/config/config.php
	application/config/database.php
	application/controllers/administrador.php
	application/controllers/coordenador.php
	application/controllers/login.php
	application/models/coordenador_model.php
	application/models/login_model.php
	application/views/administrador/alterarFederado.php
	application/views/administrador/alterarFilial.php
	application/views/administrador/alterarPedido.php
	application/views/administrador/imprimirFederado.php
	application/views/administrador/incluirFederado.php
	application/views/administrador/incluirFilial.php
	application/views/administrador/malaDireta.php
	application/views/administrador/notificacoes.php
	application/views/administrador/pedidos.php
	application/views/coordenador/modalidade.php
	application/views/header.php
	application/views/instrutores/alterarFederado.php
	application/views/instrutores/imprimirFederado.php
	application/views/login.php
	assets/css/bootstrap.css
	assets/css/unicorn.main.css
	banco/federacaoHumberto.sql
	index.php
removendo
Merge remote-tracking branch 'origin/marcos'

Conflicts:
	.gitignore
	.htaccess
	application/config/config.php
	application/config/database.php
	application/controllers/administrador.php
	application/controllers/alunos.php
	application/controllers/coordenador.php
	application/controllers/home.php
	application/controllers/instrutores.php
	application/controllers/login.php
	application/libraries/funcoes.php
	application/models/coordenador_model.php
	application/models/instrutor_model.php
	application/models/login_model.php
	application/views/coordenador/editar.php
	application/views/coordenador/listaEventos.php
	application/views/header.php
	application/views/instrutores/alterarFederado.php
	application/views/instrutores/cadastro.php
	application/views/instrutores/imprimirFederado.php
	application/views/instrutores/incluirFederado.php
	application/views/instrutores/inscricao.php
	application/views/instrutores/manutencao.php
	application/views/instrutores/novoaluno.php
	application/views/instrutores/sucessoAlteracaoFederado.php
	application/views/login.php
ignore
remover tudo
remover
arquivos lib