Resolve loading_button

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

 <script>
   /* eslint-disable vue/require-default-prop */
-<<<<<<< HEAD
   /* This is a re-usable vue component for rendering a button
     that will probably be sending off ajax requests and need
     to show the loading status by setting the `loading` option.
@@ -50,58 +49,6 @@
         this.$emit('click', e);
       },
     },
-=======
-
-  /* This is a re-usable vue component for rendering a button
-    that will probably be sending off ajax requests and need
-    to show the loading status by setting the `loading` option.
-    This can also be used for initial page load when you don't
-    know the action of the button yet by setting
-    `loading: true, label: undefined`.
-
-    Sample configuration:
-
-    <loading-button
-      :loading="true"
-      :label="Hello"
-      @click="..."
-    />
-
-  */
-
-  import loadingIcon from './loading_icon.vue';
-
-  export default {
-    components: {
-      loadingIcon,
-    },
-    props: {
-      loading: {
-        type: Boolean,
-        required: false,
-        default: false,
-      },
-      disabled: {
-        type: Boolean,
-        required: false,
-        default: false,
-      },
-      label: {
-        type: String,
-        required: false,
-      },
-      containerClass: {
-        type: String,
-        required: false,
-        default: 'btn btn-align-content',
-      },
-    },
-    methods: {
-      onClick(e) {
-        this.$emit('click', e);
-      },
-    },
->>>>>>> upstream/master
   };
 </script>