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

54f2ca24 · Clement Ho · 2c507fc0 · 54f2ca24
Commit 54f2ca24 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/merge_requests.scss app/assets/stylesheets/pages/merge_requests.scss +0 -4

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

 .card-new-merge-request {
-<<<<<<< HEAD
-  .card-heading {
-=======
  .card-header {
->>>>>>> gitlab-ce/master
    padding: 5px 10px;
    font-weight: $gl-font-weight-bold;
    line-height: 25px;