1 files changed, 0 insertions, 26 deletions
diff --git a/app/assets/javascripts/reports/components/modal.vue b/app/assets/javascripts/reports/components/modal.vue
index d51d31f042e..6b49d0b832e 100644
--- a/app/assets/javascripts/reports/components/modal.vue
+++ b/app/assets/javascripts/reports/components/modal.vue
@@ -31,7 +31,6 @@
         this.$emit('createIssue');
       },
     },
-<<<<<<< HEAD
     computed: {
       shouldRenderFooterSection() {
         return this.canCreateIssuePermission;
@@ -41,19 +40,13 @@
         return false;
       },
     }
-=======
->>>>>>> 8f3b9c0d313f9eeef1b6e6b5eccf622156e960bd
   };
 </script>
 <template>
   <modal
     id="modal-mrwidget-reports"
     :header-title-text="title"
-<<<<<<< HEAD
     :class="{ 'modal-hide-footer': !shouldRenderFooterSection }"
-=======
-    :class="{ 'modal-hide-footer': false }"
->>>>>>> 8f3b9c0d313f9eeef1b6e6b5eccf622156e960bd
     class="modal-security-report-dast"
   >
     <slot>
@@ -93,7 +86,6 @@
       </div>
     </slot>
     <div slot="footer">
-<<<<<<< HEAD
       <template v-if="shouldRenderFooterSection">
         <button
           type="button"
@@ -112,24 +104,6 @@
           @click="handleCreateIssueClick"
         />
       </template>
-=======
-      <button
-        type="button"
-        class="btn btn-default"
-        data-dismiss="modal"
-      >
-        {{ __('Cancel' ) }}
-      </button>
-
-      <loading-button
-        v-if="canCreateIssuePermission"
-        :loading="isCreatingNewIssue"
-        :disabled="isCreatingNewIssue"
-        :label="__('Create issue')"
-        container-class="js-create-issue-btn btn btn-success btn-inverted"
-        @click="handleCreateIssueClick"
-      />
->>>>>>> 8f3b9c0d313f9eeef1b6e6b5eccf622156e960bd
     </div>
   </modal>
 </template>