Resolve conflicts in environments code

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

@@ -86,11 +86,7 @@ module.exports = Vue.component('environment-component', {
 
     this.isLoading = true;
 
-<<<<<<< HEAD:app/assets/javascripts/environments/components/environment.js
     return this.service.get()
-=======
-    return service.get()
->>>>>>> ce-com/master:app/assets/javascripts/environments/components/environment.js
       .then(resp => ({
         headers: resp.headers,
         body: resp.json(),
@@ -195,18 +191,10 @@ module.exports = Vue.component('environment-component', {
           <environment-table
             :environments="state.environments"
             :can-create-deployment="canCreateDeploymentParsed"
-<<<<<<< HEAD:app/assets/javascripts/environments/components/environment.js
             :can-read-environment="canReadEnvironmentParsed"
-            :play-icon-svg="playIconSvg"
-            :terminal-icon-svg="terminalIconSvg"
-            :commit-icon-svg="commitIconSvg"
             :toggleDeployBoard="toggleDeployBoard"
             :store="store"
-            :service="service">
-          </environment-table>
-=======
-            :can-read-environment="canReadEnvironmentParsed"/>
->>>>>>> ce-com/master:app/assets/javascripts/environments/components/environment.js
+            :service="service"/>
         </div>
 
         <table-pagination v-if="state.paginationInformation && state.paginationInformation.totalPages > 1"

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

@@ -46,29 +46,11 @@ module.exports = Vue.component('environment-item', {
       required: false,
       default: false,
     },
-<<<<<<< HEAD:app/assets/javascripts/environments/components/environment_item.js
-
-    commitIconSvg: {
-      type: String,
-      required: false,
-    },
-
-    playIconSvg: {
-      type: String,
-      required: false,
-    },
-
-    terminalIconSvg: {
-      type: String,
-      required: false,
-    },
 
     toggleDeployBoard: {
       type: Function,
       required: false,
     },
-=======
->>>>>>> ce-com/master:app/assets/javascripts/environments/components/environment_item.js
   },
 
   computed: {

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

@@ -33,22 +33,6 @@ module.exports = Vue.component('environment-table-component', {
       required: false,
       default: false,
     },
-<<<<<<< HEAD:app/assets/javascripts/environments/components/environments_table.js
-
-    commitIconSvg: {
-      type: String,
-      required: false,
-    },
-
-    playIconSvg: {
-      type: String,
-      required: false,
-    },
-
-    terminalIconSvg: {
-      type: String,
-      required: false,
-    },
 
     toggleDeployBoard: {
       type: Function,
@@ -67,8 +51,6 @@ module.exports = Vue.component('environment-table-component', {
       required: false,
       default: () => ({}),
     },
-=======
->>>>>>> ce-com/master:app/assets/javascripts/environments/components/environments_table.js
   },
 
   template: `
@@ -90,11 +72,7 @@ module.exports = Vue.component('environment-table-component', {
           <tr is="environment-item"
             :model="model"
             :can-create-deployment="canCreateDeployment"
-<<<<<<< HEAD:app/assets/javascripts/environments/components/environments_table.js
             :can-read-environment="canReadEnvironment"
-            :play-icon-svg="playIconSvg"
-            :terminal-icon-svg="terminalIconSvg"
-            :commit-icon-svg="commitIconSvg"
             :toggleDeployBoard="toggleDeployBoard"></tr>
 
           <tr v-if="model.hasDeployBoard && model.isDeployBoardVisible" class="js-deploy-board-row">
@@ -108,9 +86,6 @@ module.exports = Vue.component('environment-table-component', {
               </deploy-board>
             </td>
           </tr>
-=======
-            :can-read-environment="canReadEnvironment"></tr>
->>>>>>> ce-com/master:app/assets/javascripts/environments/components/environments_table.js
         </template>
       </tbody>
     </table>

app/assets/javascripts/environments/folder/environments_folder_view.js

@@ -93,11 +93,7 @@ module.exports = Vue.component('environment-folder-view', {
 
     this.isLoading = true;
 
-<<<<<<< HEAD:app/assets/javascripts/environments/folder/environments_folder_view.js
     return this.service.get()
-=======
-    return service.get()
->>>>>>> ce-com/master:app/assets/javascripts/environments/folder/environments_folder_view.js
       .then(resp => ({
         headers: resp.headers,
         body: resp.json(),