Fix conflicts in environment Vue component

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

@@ -247,12 +247,9 @@ export default {
           :environments="state.environments"
           :can-create-deployment="canCreateDeploymentParsed"
           :can-read-environment="canReadEnvironmentParsed"
-<<<<<<< HEAD
           :toggleDeployBoard="toggleDeployBoard"
           :store="store"
           :service="service"
-=======
->>>>>>> ce/master
           :is-loading-folder-content="isLoadingFolderContent" />
       </div>
 

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

@@ -41,7 +41,6 @@ export default {
       required: false,
       default: false,
     },
-<<<<<<< HEAD
 
     toggleDeployBoard: {
       type: Function,
@@ -53,8 +52,6 @@ export default {
       required: true,
       default: () => ({}),
     },
-=======
->>>>>>> ce/master
   },
 
   computed: {

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

@@ -18,15 +18,12 @@ export default {
       type: Boolean,
       default: true,
     },
-<<<<<<< HEAD
 
     service: {
       type: Object,
       required: true,
       default: () => ({}),
     },
-=======
->>>>>>> ce/master
   },
 
   data() {

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

@@ -11,15 +11,12 @@ export default {
       type: String,
       default: '',
     },
-<<<<<<< HEAD
 
     service: {
       type: Object,
       required: true,
       default: () => ({}),
     },
-=======
->>>>>>> ce/master
   },
 
   data() {

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

@@ -87,7 +87,6 @@ export default {
           :model="model"
           :can-create-deployment="canCreateDeployment"
           :can-read-environment="canReadEnvironment"
-<<<<<<< HEAD
           :service="service"
           :toggleDeployBoard="toggleDeployBoard"
           />
@@ -103,9 +102,6 @@ export default {
               />
           </td>
         </tr>
-=======
-          />
->>>>>>> ce/master
 
         <template v-if="model.isFolder && model.isOpen && model.children && model.children.length > 0">
           <tr v-if="isLoadingFolderContent">