Bug : Affichages des conges

2026-04-30 13:28:57 +02:00
parent 0936d6ad02
commit 7826f517f5
251 changed files with 41879 additions and 2 deletions
--- a/gestion_salle/templates/gestion_salle/parts/modalDetailResevation.html
+++ b/gestion_salle/templates/gestion_salle/parts/modalDetailResevation.html
@@ -1,5 +1,8 @@
 <!-- Modal d'affichage des détails d'une reservation -->
+<<<<<<< HEAD
 {% load tags_personnaliser %}
+=======
+>>>>>>> 6026af5 (Bug : Affichages des conges)
 <div class="modal fade" id="modalDetailReservation" tabindex="-1" aria-labelledby="modalDetailReservationLabel" aria-hidden="true">
    <div class="modal-dialog">
        <div class="modal-content">