fixing merge conflict with admin.css

diff --git a/css/admin.css b/css/admin.css
index a82aff2..4f793a7 100644 (file)
--- a/css/admin.css
+++ b/css/admin.css
@@ -339,6 +339,7 @@ input[type=submit], input[type=file] {
     cursor: pointer;
 }
 .showLists, .showDetails{
+
 /*    margin:0;
     float:left;
     width:50%; */