Eliminados algunos paneles
Merge remote-tracking branch 'origin/master'
Intentando otra vez
Merge remote-tracking branch 'origin/master'

Conflicts:
	build/classes/proen/PanelVerPlantas.form
	nbproject/private/private.properties
	nbproject/private/private.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	build/classes/paneles/registro/PanelRegistroPlantaGerente.form
	build/classes/proen/PanelVerProductos.form
	nbproject/private/private.xml
	src/paneles/registro/PanelRegistroPlantaGerente.form
	src/paneles/registro/PanelRegistroPlantaGerente.java