Resolve conflicts in app/assets/stylesheets/framework/common.scss

150faff7 · Winnie Hellmann · a7411efa · 150faff7
Commit 150faff7 authored Nov 06, 2017 by Winnie Hellmann
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

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

No files found.
--- a/app/assets/stylesheets/framework/common.scss
+++ b/app/assets/stylesheets/framework/common.scss
@@ -285,7 +285,6 @@ img.emoji {
  margin-bottom: 10px;
 }
-<<<<<<< HEAD
 .available-groups form {
  margin: 5px 0;
 }
@@ -297,8 +296,6 @@ table {
  }
 }
-=======
->>>>>>> ce-com/master
 .btn-sign-in {
  text-shadow: none;