Fix merge conflicts

phpmyadmin · Mar 14, 2012 · b43f208 · b43f208
2 parents 3ef54c5 + 3cdb0e5
commit b43f208
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php
@@ -1134,8 +1134,6 @@
 #topmenucontainer {
     padding-right: 1em;
     width: 100%;
-    border-bottom: 1px solid #ccc;
-    background-color: #dcdcdc;
 }
 
 #serverinfo {