css/menu.less: resolve merge conflict

2014-11-13 21:28:51 +01:00 · 2014-11-13 21:28:51 +01:00 · 2a27b6ce25
parent 903219b302
commit 2a27b6ce25
1 changed files with 1 additions and 9 deletions
--- 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 {