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

4553453f · Clement Ho · cbd02c6b · 4553453f
Commit 4553453f 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/groups.scss app/assets/stylesheets/pages/groups.scss +0 -4

No files found.
--- a/app/assets/stylesheets/pages/groups.scss
+++ b/app/assets/stylesheets/pages/groups.scss
@@ -2,11 +2,7 @@
  @include str-truncated(90%);
 }

-<<<<<<< HEAD
-.dashboard .side .card .card-heading .input-group {
-=======
 .dashboard .side .card .card-header .input-group {
->>>>>>> gitlab-ce/master

  .form-control {
    height: 42px;