From 2d743a1c903f865e9fc8f0f738a83d929b40c876 Mon Sep 17 00:00:00 2001
From: Kevin <kevin@figureslibres.io>
Date: Mon, 29 Jun 2020 11:10:03 +0200
Subject: [PATCH] fix merge

---
 web/app/themes/la_mine/templates/base.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/app/themes/la_mine/templates/base.twig b/web/app/themes/la_mine/templates/base.twig
index 68ab8136..9346e225 100644
--- a/web/app/themes/la_mine/templates/base.twig
+++ b/web/app/themes/la_mine/templates/base.twig
@@ -35,7 +35,7 @@
 						</div>
 					</div>
 				</div>
-
+ 
 
 				<nav id="nav-main" class="nav-main" role="navigation">
 					{% include "menu.twig" with {'items': menu.get_items} %}