fix conflict for /environments/components/environment_stop.vue [ci skip]

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

 <script>
   /**
-<<<<<<< HEAD
-   * Renders the stop "button" that allows stop an environment.
-   * Used in environments table.
-   */
-=======
   * Renders the stop "button" that allows stop an environment.
   * Used in environments table.
   */
->>>>>>> upstream/master
   import eventHub from '../event_hub';
   import loadingIcon from '../../vue_shared/components/loading_icon.vue';
   import tooltip from '../../vue_shared/directives/tooltip';
@@ -16,18 +10,11 @@
   export default {
     components: {
       loadingIcon,
-<<<<<<< HEAD
-    },
-    directives: {
-      tooltip,
-    },
-=======
     },
 
     directives: {
       tooltip,
     },
->>>>>>> upstream/master
 
     props: {
       stopUrl: {