Skip to content
Snippets Groups Projects
  • OURY Sarah's avatar
    8f3d46e5
    Merge branch 'main' into 'develop' · 8f3d46e5
    OURY Sarah authored
    # Conflicts:
    #   e2e/input_template/EquipementPhysique_hors_serveur.csv
    #   services/api-event-calculs/pom.xml
    #   services/api-event-calculs/src/main/java/org/mte/numecoeval/calculs/infrastructure/service/enrichissement/EnrichissementEquipementPhysiqueService.java
    #   services/api-event-calculs/src/test/java/org/mte/numecoeval/calculs/infrastructure/service/calcul/EnrichissementEquipementPhysiqueServiceTest.java
    #   services/api-event-donneesentrees/pom.xml
    #   services/api-expositiondonneesentrees/pom.xml
    #   services/api-referentiel/pom.xml
    #   services/calculs/pom.xml
    #   services/calculs/src/main/java/org/mte/numecoeval/calculs/domain/data/demande/DemandeCalculImpactOperationNonIT.java
    #   services/common/pom.xml
    #   services/core/pom.xml
    8f3d46e5
    History
    Merge branch 'main' into 'develop'
    OURY Sarah authored
    # Conflicts:
    #   e2e/input_template/EquipementPhysique_hors_serveur.csv
    #   services/api-event-calculs/pom.xml
    #   services/api-event-calculs/src/main/java/org/mte/numecoeval/calculs/infrastructure/service/enrichissement/EnrichissementEquipementPhysiqueService.java
    #   services/api-event-calculs/src/test/java/org/mte/numecoeval/calculs/infrastructure/service/calcul/EnrichissementEquipementPhysiqueServiceTest.java
    #   services/api-event-donneesentrees/pom.xml
    #   services/api-expositiondonneesentrees/pom.xml
    #   services/api-referentiel/pom.xml
    #   services/calculs/pom.xml
    #   services/calculs/src/main/java/org/mte/numecoeval/calculs/domain/data/demande/DemandeCalculImpactOperationNonIT.java
    #   services/common/pom.xml
    #   services/core/pom.xml