Resolve comment_form

fa5ff2cc · Luke Bennett · 0fed2ce1 · fa5ff2cc
Commit fa5ff2cc authored Jan 11, 2018 by Luke Bennett
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

app/assets/javascripts/notes/components/comment_form.vue app/assets/javascripts/notes/components/comment_form.vue +0 -4

No files found.
--- a/app/assets/javascripts/notes/components/comment_form.vue
+++ b/app/assets/javascripts/notes/components/comment_form.vue
@@ -307,12 +307,8 @@ js-gfm-input js-autosize markdown-area js-vue-textarea"
              <div class="note-form-actions">
                <div
                  class="pull-left btn-group
-<<<<<<< HEAD
 append-right-10 comment-type-dropdown js-comment-type-dropdown droplab-dropdown"
                >
-=======
-append-right-10 comment-type-dropdown js-comment-type-dropdown droplab-dropdown">
->>>>>>> upstream/master
                  <button
                    @click.prevent="handleSave()"
                    :disabled="isSubmitButtonDisabled"