remove style that doesn't appear to be used

bebb2523 · Simon Knox · 9cfceb5f · bebb2523
Commit bebb2523 authored Jun 12, 2018 by Simon Knox
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 7 deletions

app/assets/stylesheets/framework/common.scss app/assets/stylesheets/framework/common.scss +0 -7

No files found.
--- a/app/assets/stylesheets/framework/common.scss
+++ b/app/assets/stylesheets/framework/common.scss
@@ -309,13 +309,6 @@ img.emoji {
  margin-bottom: 10px;
 }

-<<<<<<< HEAD
-.available-groups form {
-  margin: 5px 0;
-}
-
-=======
->>>>>>> upstream/master
 .side-filters {
  fieldset {
    margin-bottom: 15px;