Resolve modal

app/assets/javascripts/vue_shared/components/modal.vue

 <script>
-<<<<<<< HEAD
-    /* eslint-disable vue/require-default-prop */
-
-  export default {
-    name: 'Modal',
-
-    props: {
-      id: {
-        type: String,
-        required: false,
-      },
-      title: {
-        type: String,
-        required: false,
-      },
-      text: {
-        type: String,
-        required: false,
-      },
-      hideFooter: {
-        type: Boolean,
-        required: false,
-        default: false,
-      },
-      kind: {
-        type: String,
-        required: false,
-        default: 'primary',
-      },
-      modalDialogClass: {
-        type: String,
-        required: false,
-        default: '',
-      },
-      closeKind: {
-        type: String,
-        required: false,
-        default: 'default',
-      },
-      closeButtonLabel: {
-        type: String,
-        required: false,
-        default: 'Cancel',
-      },
-      primaryButtonLabel: {
-        type: String,
-        required: false,
-        default: '',
-      },
-      submitDisabled: {
-        type: Boolean,
-        required: false,
-        default: false,
-      },
-    },
-
-    computed: {
-      btnKindClass() {
-        return {
-          [`btn-${this.kind}`]: true,
-        };
-      },
-      btnCancelKindClass() {
-        return {
-          [`btn-${this.closeKind}`]: true,
-        };
-      },
-    },
-
-=======
   /* eslint-disable vue/require-default-prop */
   export default {
     name: 'Modal',
@@ -136,7 +66,6 @@
       },
     },
 
->>>>>>> upstream/master
     methods: {
       emitCancel(event) {
         this.$emit('cancel', event);