From df422a589c45b9fc8961ae4830c85c2f222525c2 Mon Sep 17 00:00:00 2001
From: bach <bachir@figureslibres.io>
Date: Tue, 8 Apr 2025 16:53:00 +0200
Subject: [PATCH] git merge bug fix

---
 .../quartiers_de_demain/templates/page--ressources.html.twig  | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/web/themes/custom/quartiers_de_demain/templates/page--ressources.html.twig b/web/themes/custom/quartiers_de_demain/templates/page--ressources.html.twig
index 5dd6961..736533c 100644
--- a/web/themes/custom/quartiers_de_demain/templates/page--ressources.html.twig
+++ b/web/themes/custom/quartiers_de_demain/templates/page--ressources.html.twig
@@ -39,11 +39,7 @@
  * @see html.html.twig
  */
 #}
-<<<<<<< HEAD
 <div class="layout-container " id="ressources">
-=======
-<div class="layout-container" id="ressources">
->>>>>>> prod
 
   <header role="banner">
     {{ page.header_left }}