From 46f9790ceb30cf00a3f9d11b8ef0121294fc1a40 Mon Sep 17 00:00:00 2001
From: Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home>
Date: Fri, 18 Mar 2016 14:06:08 -0400
Subject: [PATCH] Fixing rebase conflicts

---
 app/assets/stylesheets/framework/jquery.scss | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/assets/stylesheets/framework/jquery.scss b/app/assets/stylesheets/framework/jquery.scss
index 7af307940d..eb3fbd9155 100644
--- a/app/assets/stylesheets/framework/jquery.scss
+++ b/app/assets/stylesheets/framework/jquery.scss
@@ -19,8 +19,6 @@
   }
 
   &.ui-autocomplete {
-    border-color: #ddd;
-    padding: 0;
     margin-top: 2px;
     z-index: 1001;
     width: 240px;