git merge bug fix
This commit is contained in:
parent
6119477d19
commit
df422a589c
@ -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 }}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user