removed conflict markers

87eb66e7 · Phil Hughes · fd43419a · 87eb66e7
Commit 87eb66e7 authored Apr 30, 2018 by Phil Hughes
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

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

No files found.
--- a/app/assets/stylesheets/pages/repo.scss
+++ b/app/assets/stylesheets/pages/repo.scss
@@ -68,8 +68,6 @@
      }
    }

-<<<<<<< HEAD
-=======
    .ide-file-icon-holder {
      display: flex;
      align-items: center;
@@ -83,7 +81,6 @@
      }
    }

->>>>>>> master
    .ide-new-btn {
      display: none;
      margin-right: -8px;