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

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

 <script>
   /**
-<<<<<<< HEAD
   * Renders Rollback or Re deploy button in environments table depending
   * of the provided property `isLastDeployment`.
   *
   * Makes a post request when the button is clicked.
   */
-=======
-  * Renders Rollback or Re deploy button in environments table depending
-  * of the provided property `isLastDeployment`.
-  *
-  * Makes a post request when the button is clicked.
-  */
->>>>>>> upstream/master
   import eventHub from '../event_hub';
   import loadingIcon from '../../vue_shared/components/loading_icon.vue';
 
@@ -20,24 +12,12 @@
     components: {
       loadingIcon,
     },
-<<<<<<< HEAD
-=======
 
->>>>>>> upstream/master
     props: {
       retryUrl: {
         type: String,
         default: '',
       },
-<<<<<<< HEAD
-
-      isLastDeployment: {
-        type: Boolean,
-        default: true,
-      },
-    },
-
-=======
 
       isLastDeployment: {
         type: Boolean,
@@ -45,7 +25,6 @@
       },
     },
 
->>>>>>> upstream/master
     data() {
       return {
         isLoading: false,