Fix conflict app/assets/javascripts/environments/components/environment_actions.vue [ci skip]

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

@@ -72,12 +72,8 @@
         <span v-html="playIconSvg"></span>
         <i
           class="fa fa-caret-down"
-<<<<<<< HEAD
-          aria-hidden="true">
-=======
           aria-hidden="true"
         >
->>>>>>> upstream/master
         </i>
         <loading-icon v-if="isLoading" />
       </span>
@@ -86,12 +82,7 @@
     <ul class="dropdown-menu dropdown-menu-align-right">
       <li
         v-for="(action, i) in actions"
-<<<<<<< HEAD
-        :key="i"
-      >
-=======
         :key="i">
->>>>>>> upstream/master
         <button
           type="button"
           class="js-manual-action-link no-btn btn"