Commit c183a62e authored by Matthieu FAURE's avatar Matthieu FAURE

correction conflit

# Conflicts:
parents 443c86f1 90e2936f
# Contributros # Contributros
* Marielle PASCALON, D69
* Matthieu FAURE, Adullact (pour de vrai) * Matthieu FAURE, Adullact (pour de vrai)
* Thomas Grimbert, SOPRA * Thomas Grimbert, SOPRA
* Hubert BOCQUET, CD59 * Hubert BOCQUET, CD59
\ No newline at end of file * Remi Baudchon, CD59
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment