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

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

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;