From 9cf9bf94c0785f9a5f2932cd59ab0db17095b655 Mon Sep 17 00:00:00 2001
From: mlorb <mlorber@biosistemika.com>
Date: Tue, 20 Mar 2018 14:30:07 +0100
Subject: [PATCH] fix merge conflict

---
 app/assets/stylesheets/themes/main_navigation.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/stylesheets/themes/main_navigation.scss b/app/assets/stylesheets/themes/main_navigation.scss
index ace42350b..94c0d7d98 100644
--- a/app/assets/stylesheets/themes/main_navigation.scss
+++ b/app/assets/stylesheets/themes/main_navigation.scss
@@ -368,6 +368,7 @@
 
 #content-wrapper {
   margin-top: 50px;
+  margin-left: 83px;
 }