Fix merge conflicts

2012-03-14 13:21:50 -04:00 · 2012-03-14 13:21:50 -04:00 · b43f20823f
commit b43f20823f
parent 3ef54c5bcc 3cdb0e565a
1 changed files with 0 additions and 2 deletions
--- a/themes/pmahomme/css/theme_right.css.php
+++ b/themes/pmahomme/css/theme_right.css.php
@ -1134,8 +1134,6 @@ div#tablestatistics table {
 #topmenucontainer {
    padding-right: 1em;
    width: 100%;
-    border-bottom: 1px solid #ccc;
-    background-color: #dcdcdc;
 }

 #serverinfo {