borrar linea
Merge remote-tracking branch 'origin/master'

Conflicts:
	configuracion/carrerasConsultar.php