Fix conflicts app/assets/javascripts/environments/components/environment_external_url.vue [ci skip]

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

@@ -3,21 +3,6 @@
   import { s__ } from '../../locale';
 
   /**
-<<<<<<< HEAD
-   * Renders the external url link in environments table.
-   */
-  export default {
-    directives: {
-      tooltip,
-    },
-
-    props: {
-      externalUrl: {
-        type: String,
-        required: true,
-      },
-    },
-=======
   * Renders the external url link in environments table.
   */
   export default {
@@ -30,7 +15,6 @@
         required: true,
       },
     },
->>>>>>> upstream/master
 
     computed: {
       title() {