Resolve conflicts in app/assets/stylesheets/pages/issuable.scss

Resolve conflict for https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8488

Resolve conflicts in app/assets/stylesheets/pages/issuable.scss
Resolve conflict for https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8488
5bf6088f · Steve Azzopardi · cd4e49ec · 5bf6088f
Commit 5bf6088f authored Nov 19, 2018 by Steve Azzopardi
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
@@ -739,14 +739,11 @@
      .issuable-main-info {
        flex: 1 auto;
        margin-right: 10px;
-<<<<<<< HEAD
        min-width: 0;
-=======

        .issue-weight-icon {
          vertical-align: sub;
        }
->>>>>>> upstream/master
      }

      .issuable-meta {