Resolve conflict in app/assets/stylesheets/pages/note_form.scss

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Resolve conflict in app/assets/stylesheets/pages/note_form.scss
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
6ee56e2b · Dmitriy Zaporozhets · 0f0dd277 · 6ee56e2b
Commit 6ee56e2b authored Oct 10, 2017 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

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

No files found.
--- a/app/assets/stylesheets/pages/note_form.scss
+++ b/app/assets/stylesheets/pages/note_form.scss
@@ -132,7 +132,6 @@
  }
 }
-<<<<<<< HEAD
 .disabled-comment .issuable-note-warning {
  border: none;
  border-radius: $label-border-radius;
@@ -149,8 +148,6 @@
  }
 }
-=======
->>>>>>> ce-com/master
 .sidebar-item-value {
  .fa {
    background-color: inherit;