Fix conflicts for app/assets/javascripts/environments/components/environment_monitoring.vue

app/assets/javascripts/environments/components/environment_monitoring.vue

 <script>
   /**
-<<<<<<< HEAD
   * Renders the Monitoring (Metrics) link in environments table.
   */
-=======
-  * Renders the Monitoring (Metrics) link in environments table.
-  */
->>>>>>> upstream/master
   import tooltip from '../../vue_shared/directives/tooltip';
 
   export default {
     directives: {
       tooltip,
-<<<<<<< HEAD
-    },
-    props: {
-      monitoringUrl: {
-        type: String,
-        required: true,
-      },
-    },
-=======
     },
 
     props: {
@@ -29,7 +15,6 @@
         required: true,
       },
     },
->>>>>>> upstream/master
 
     computed: {
       title() {