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

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

No files found.
--- a/app/assets/stylesheets/pages/issues.scss
+++ b/app/assets/stylesheets/pages/issues.scss
@@ -276,11 +276,7 @@ ul.related-merge-requests > li {
    }

    .create-mr-dropdown-wrap {
-<<<<<<< HEAD
-      .btn-group:not(.hide) {
-=======
      .btn-group:not(.hidden) {
->>>>>>> gitlab-ce/master
        display: inline-flex;
      }
    }