[icinga-checkins] icinga.org: icingaweb2/feature/redesign-7144: css/menu.less: resolve merge conflict

git at icinga.org git at icinga.org
Thu Nov 13 21:29:06 CET 2014


Module: icingaweb2
Branch: feature/redesign-7144
Commit: 2a27b6ce251a18ccf1e6865e703f0ce2acc7baa2
URL:    https://git.icinga.org/?p=icingaweb2.git;a=commit;h=2a27b6ce251a18ccf1e6865e703f0ce2acc7baa2

Author: Thomas Gelf <thomas at gelf.net>
Date:   Thu Nov 13 21:28:51 2014 +0100

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 664d22c..c8ab698 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 {



More information about the icinga-checkins mailing list