git merge bug fix

2025-04-08 16:53:00 +02:00 · 2025-04-08 16:53:00 +02:00 · df422a589c
commit df422a589c
parent 6119477d19
1 changed files with 0 additions and 4 deletions
--- 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 }}