Fix conflict in app/assets/stylesheets/pages/members.scss

2c507fc0 · Clement Ho · c3fa2413 · 2c507fc0
Commit 2c507fc0 authored May 25, 2018 by Clement Ho
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

app/assets/stylesheets/pages/members.scss app/assets/stylesheets/pages/members.scss +0 -4

No files found.
--- a/app/assets/stylesheets/pages/members.scss
+++ b/app/assets/stylesheets/pages/members.scss
@@ -211,11 +211,7 @@
 }

 .card {
-<<<<<<< HEAD
-  .card-heading {
-=======
  .card-header {
->>>>>>> gitlab-ce/master
    .badge.badge-pill {
      margin-top: 0;
    }