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

5b60f612 · Stan Hu · 6b56500d · 5b60f612
Commit 5b60f612 authored Oct 23, 2018 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

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

No files found.
--- a/app/assets/stylesheets/pages/issues.scss
+++ b/app/assets/stylesheets/pages/issues.scss
@@ -330,7 +330,6 @@ ul.related-merge-requests > li {
    text-align: right;
  }
 }
-<<<<<<< HEAD

 .issue-token {
  display: inline-flex;
@@ -437,5 +436,3 @@ ul.related-merge-requests > li {
    font-size: 0.9em;
  }
 }
-=======
->>>>>>> upstream/master