funcionalidad resolver incidencia
Merge branch 'master' of https://github.com/maiteyanguas/innova4b-daw-modulo7-empresaReparto.git

Conflicts:
	src/main/java/innova4b/empresaReparto/incidencia/repository/IncidenciaDao.java