From 2a27b6ce251a18ccf1e6865e703f0ce2acc7baa2 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Thu, 13 Nov 2014 21:28:51 +0100
Subject: [PATCH] css/menu.less: resolve merge conflict

---
 public/css/icinga/menu.less | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/public/css/icinga/menu.less b/public/css/icinga/menu.less
index 664d22c52..c8ab698a5 100644
--- a/public/css/icinga/menu.less
+++ b/public/css/icinga/menu.less
@@ -25,11 +25,7 @@
 }
 
 #menu li {
-<<<<<<< HEAD
-    margin-left: 0.0em;
-=======
-  margin-left: 0.5em;
->>>>>>> master
+  margin-left: 0.0em;
 }
 
 #menu > ul > li > ul {
@@ -159,12 +155,8 @@
 }
 
 #menu li.hover > a {
-<<<<<<< HEAD
   color: black;
-=======
-  color: white;
   overflow: visible;
->>>>>>> master
 }
 
 #menu li.hover > ul a {