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

cbd02c6b · Clement Ho · 9fc1229e · cbd02c6b
Commit cbd02c6b 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/editor.scss app/assets/stylesheets/pages/editor.scss +0 -4

No files found.
--- a/app/assets/stylesheets/pages/editor.scss
+++ b/app/assets/stylesheets/pages/editor.scss
@@ -110,10 +110,6 @@
  }
 }

-<<<<<<< HEAD
-=======
-
->>>>>>> gitlab-ce/master
 @include media-breakpoint-down(xs) {
  .file-editor {
    .file-title {