fix merge conflicts

apache · Aug 10, 2017 · f226cd9 · f226cd9
1 parent 27ce929
commit f226cd9
Showing 1 changed file with 10 additions and 9 deletions.
diff --git a/superset/assets/stylesheets/superset.less b/superset/assets/stylesheets/superset.less
@@ -237,23 +237,24 @@ div.widget .slice_container {
 .Select-menu-outer {
     z-index: 10 !important;
 }
+
 /** not found record **/
 .panel b {
-  display: inline-block;
-  width: 98%;
-  padding: 2rem;
-  margin: 0 1% 20px 1%;
-  background: #f8f8f8;
+    display: inline-block;
+    width: 98%;
+    padding: 2rem;
+    margin: 0 1% 20px 1%;
+    background: #f8f8f8;
 }
 
 /** table on both sides of the gap **/
 .panel .table-responsive{
-  margin: 0 1%;
+    margin: 0 1%;
 }
 @media screen and (max-width: 767px) {
-  .panel .table-responsive{
-    width: 98%;
-  }
+    .panel .table-responsive{
+        width: 98%;
+    }
 }
 
 .list-container {