Skip to content
  • asolanas's avatar
    10ab94a9
    Merge origin/branche_test_1er_Sprint into branche_test_1er_Sprint · 10ab94a9
    asolanas authored 
    # Conflicts:
#	ProDigiUp_GesCollab/pom.xml
#	ProDigiUp_GesCollab/src/main/java/dao/DaoFactory.java
#	ProDigiUp_GesCollab/src/main/java/dao/ResponsableActiviteDao.java
#	ProDigiUp_GesCollab/src/main/java/entities/ResponsableActivite.java
#	ProDigiUp_GesCollab/src/main/java/forms/FormChecker.java
#	ProDigiUp_GesCollab/src/main/java/forms/ResponsableActiviteFormChecker.java
#	ProDigiUp_GesCollab/src/main/webapp/WEB-INF/jsp/afficherResponsableActivite.jsp
#	ProDigiUp_GesCollab/src/main/webapp/WEB-INF/jsp/creerResponsableActivite.jsp
#	ProDigiUp_GesCollab/src/main/webapp/WEB-INF/jsp/page_accueil.jsp
#	ProDigiUp_GesCollab/src/main/webapp/WEB-INF/jspf/header.jsp
    10ab94a9
    Merge origin/branche_test_1er_Sprint into branche_test_1er_Sprint
    asolanas authored 
    # Conflicts:
#	ProDigiUp_GesCollab/pom.xml
#	ProDigiUp_GesCollab/src/main/java/dao/DaoFactory.java
#	ProDigiUp_GesCollab/src/main/java/dao/ResponsableActiviteDao.java
#	ProDigiUp_GesCollab/src/main/java/entities/ResponsableActivite.java
#	ProDigiUp_GesCollab/src/main/java/forms/FormChecker.java
#	ProDigiUp_GesCollab/src/main/java/forms/ResponsableActiviteFormChecker.java
#	ProDigiUp_GesCollab/src/main/webapp/WEB-INF/jsp/afficherResponsableActivite.jsp
#	ProDigiUp_GesCollab/src/main/webapp/WEB-INF/jsp/creerResponsableActivite.jsp
#	ProDigiUp_GesCollab/src/main/webapp/WEB-INF/jsp/page_accueil.jsp
#	ProDigiUp_GesCollab/src/main/webapp/WEB-INF/jspf/header.jsp