Fix SCSS conflicts

6f8406ae · Nick Thomas · f4c5ce68 · 6f8406ae
Commit 6f8406ae authored Jun 30, 2017 by Nick Thomas
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/assets/stylesheets/pages/issuable.scss app/assets/stylesheets/pages/issuable.scss +0 -3

No files found.
--- a/app/assets/stylesheets/pages/issuable.scss
+++ b/app/assets/stylesheets/pages/issuable.scss
@@ -659,12 +659,9 @@
    @media(max-width: $screen-md-max) {
      .task-status,
      .issuable-due-date,
-<<<<<<< HEAD
      .project-ref-path,
      .issuable-weight {
-=======
      .project-ref-path {
->>>>>>> ce/master
        display: none;
      }
    }