git merge bug fix

This commit is contained in:
Bachir Soussi Chiadmi 2025-04-08 16:53:00 +02:00
parent 6119477d19
commit df422a589c

View File

@ -39,11 +39,7 @@
* @see html.html.twig * @see html.html.twig
*/ */
#} #}
<<<<<<< HEAD
<div class="layout-container " id="ressources"> <div class="layout-container " id="ressources">
=======
<div class="layout-container" id="ressources">
>>>>>>> prod
<header role="banner"> <header role="banner">
{{ page.header_left }} {{ page.header_left }}