From 4f929c7052e00510eb377bc2c9a5ec35c5219715 Mon Sep 17 00:00:00 2001
From: mabashian <mabashia@redhat.com>
Date: Mon, 21 Jan 2019 13:30:15 -0500
Subject: [PATCH] Fix inadvertent merge conflict change

---
 src/app.scss | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/app.scss b/src/app.scss
index b4b176f3d3..09b71e6f2b 100644
--- a/src/app.scss
+++ b/src/app.scss
@@ -119,6 +119,13 @@
   --pf-c-about-modal-box--MaxWidth: 63rem;
 }
 
+.pf-c-list {
+  li {
+    list-style-type: none;
+    margin: 0;
+    padding: 0;
+  }
+}
 
 .awx-lookup {
   min-height: 36px;
@@ -150,12 +157,6 @@
 .awx-c-list {
   border-top: 1px solid #d7d7d7;
   border-bottom: 1px solid #d7d7d7;
-
-  li {
-    list-style-type: none;
-    margin: 0;
-    padding: 0;
-  }
 }
 //
 // pf modal overrides