Skip to content
Snippets Groups Projects
Commit 8f3d46e5 authored by OURY Sarah's avatar OURY Sarah
Browse files

Merge branch 'main' into 'develop'

# 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
parents 0fb7b8ef 61276dcb
No related branches found
No related tags found
1 merge request!35preparation release 2.1.0
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment