From 4692f7766057c88d87c05a0b07b9070bc557b5ca Mon Sep 17 00:00:00 2001
From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Thu, 9 Jun 2016 16:41:24 -0400
Subject: [PATCH] fixing merge conflict with admin.css

---
 css/admin.css | 1 +
 1 file changed, 1 insertion(+)

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%; */
-- 
2.17.1