Resolve conflict in app/assets/javascripts/notes/components/comment_form.vue

Resolve conflict for https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8664

app/assets/javascripts/notes/components/comment_form.vue

@@ -366,13 +366,8 @@ append-right-10 comment-type-dropdown js-comment-type-dropdown droplab-dropdown"
               >
                 <button
                   :disabled="isSubmitButtonDisabled"
-<<<<<<< HEAD
-                  class="btn btn-success comment-btn js-comment-button js-comment-submit-button
-                  qa-comment-button"
-=======
                   class="btn btn-create comment-btn js-comment-button js-comment-submit-button
                     qa-comment-button"
->>>>>>> upstream/master
                   type="submit"
                   @click.prevent="handleSave();"
                 >