Fixing rebase conflicts

46f9790c · Jacob Schatz · cdd7e185 · 46f9790c
Commit 46f9790c authored Mar 18, 2016 by Jacob Schatz
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 2 deletions

app/assets/stylesheets/framework/jquery.scss app/assets/stylesheets/framework/jquery.scss +0 -2

No files found.
--- 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;