From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Thu, 9 Jun 2016 20:41:24 +0000 (-0400)
Subject: fixing merge conflict with admin.css
X-Git-Tag: v2.0.9^2
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=4692f7766057c88d87c05a0b07b9070bc557b5ca;p=WP-Plugins%2Fglm-member-db.git

fixing merge conflict with admin.css
---

diff --git a/css/admin.css b/css/admin.css
index a82aff2e..4f793a7f 100644
--- 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%; */