Fix bad merge

Dolibarr · Sep 12, 2016 · dbc017a · dbc017a
1 parent 1fbf233
commit dbc017a
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
@@ -4415,11 +4415,7 @@
 
 /* nboftopmenuentries = <?php echo $nbtopmenuentries ?>, fontsize=<?php echo $fontsize ?> */
 /* rule to reduce top menu - 1st reduction */
-<<<<<<< HEAD
 @media only screen and (max-width: <?php echo round($nbtopmenuentries * $fontsize * 7, 0) + 20; ?>px)
-=======
-@media only screen and (max-width: <?php echo round($nbtopmenuentries * $fontsize * 6.9, 0) + 8; ?>px)
->>>>>>> branch '3.9' of git@github.com:Dolibarr/dolibarr.git
 {
 	div.tmenucenter {
 	    max-width: <?php echo round($fontsize * 4); ?>px;	/* size of viewport */