Fix conflicts within app/assets/javascripts/monitoring/components/dashboard.vue

app/assets/javascripts/monitoring/components/dashboard.vue

@@ -138,7 +138,6 @@ export default {
   },
   mounted() {
     this.resizeThrottled = _.debounce(this.resize, 100);
-<<<<<<< HEAD
     this.servicePromises = [
       this.service
         .getGraphsData()
@@ -149,8 +148,6 @@ export default {
         .then(data => this.store.storeDeploymentData(data))
         .catch(() => Flash(s__('Metrics|There was an error getting deployment information.'))),
     ];
-=======
->>>>>>> upstream/master
     if (!this.hasMetrics) {
       this.state = 'gettingStarted';
     } else {
@@ -198,11 +195,7 @@ export default {
 <template>
   <div
     v-if="!showEmptyState"
-<<<<<<< HEAD
-    :key="updateDashboardKey"
-=======
     :key="forceRedraw"
->>>>>>> upstream/master
     class="prometheus-graphs prepend-top-default"
   >
     <div