Fix conflicts in environments components

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

@@ -57,7 +57,6 @@ export default Vue.component('environment-component', {
     canCreateEnvironmentParsed() {
       return gl.utils.convertPermissionToBoolean(this.canCreateEnvironment);
     },
-<<<<<<< HEAD
 
     /**
      * Pagination should only be rendered when we have information about it and when the
@@ -68,9 +67,6 @@ export default Vue.component('environment-component', {
     shouldRenderPagination() {
       return this.state.paginationInformation && this.state.paginationInformation.totalPages > 1;
     },
-
-=======
->>>>>>> ce-com/master
   },
 
   /**

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

@@ -13,14 +13,6 @@ import RollbackComponent from './environment_rollback';
 import TerminalButtonComponent from './environment_terminal_button';
 import CommitComponent from '../../vue_shared/components/commit';
 
-<<<<<<< HEAD
-=======
-/**
- * Envrionment Item Component
- *
- * Renders a table row for each environment.
- */
->>>>>>> ce-com/master
 const timeagoInstance = new Timeago();
 
 export default {

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

@@ -4,21 +4,13 @@
  * Dumb component used to render top level environments and
  * the folder view.
  */
-<<<<<<< HEAD
-import EnvironmentItem from './environment_item';
-import DeployBoard from './deploy_board_component';
-
-export default {
-  components: {
-    EnvironmentItem,
-    DeployBoard,
-=======
 import EnvironmentTableRowComponent from './environment_item';
+import DeployBoard from './deploy_board_component';
 
 export default {
   components: {
     'environment-item': EnvironmentTableRowComponent,
->>>>>>> ce-com/master
+    DeployBoard,
   },
 
   props: {