Resolve conflicts

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

@@ -179,11 +179,7 @@ export default {
             </span>
           </a>
         </li>
-<<<<<<< HEAD:app/assets/javascripts/environments/components/environment.vue
-        <li :class="{ active : scope === 'stopped' }">
-=======
         <li :class="{ 'active' : scope === 'stopped' }">
->>>>>>> upstream/master:app/assets/javascripts/environments/components/environment.vue
           <a :href="projectStoppedEnvironmentsPath">
             Stopped
             <span class="badge js-stopped-environments-count">
@@ -249,12 +245,7 @@ export default {
           :is-loading-folder-content="isLoadingFolderContent" />
       </div>
 
-<<<<<<< HEAD:app/assets/javascripts/environments/components/environment.vue
-      <table-pagination
-        v-if="state.paginationInformation && state.paginationInformation.totalPages > 1"
-=======
       <table-pagination v-if="state.paginationInformation && state.paginationInformation.totalPages > 1"
->>>>>>> upstream/master:app/assets/javascripts/environments/components/environment.vue
         :change="changePage"
         :pageInfo="state.paginationInformation" />
     </div>

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

 import Vue from 'vue';
 import EnvironmentsFolderComponent from './environments_folder_view.vue';
 
-<<<<<<< HEAD
-document.addEventListener('DOMContentLoaded', () => new Vue({
-  el: '#environments-folder-list-view',
-  components: {
-    'environments-folder-app': EnvironmentsFolderComponent,
-  },
-  render: createElement => createElement('environments-folder-app'),
-}));
-=======
 document.addEventListener('DOMContentLoaded', () => {
   // eslint-disable-next-line no-new
   new Vue({
@@ -20,4 +11,3 @@ document.addEventListener('DOMContentLoaded', () => {
     render: createElement => createElement('environments-folder-app'),
   });
 });
->>>>>>> upstream/master

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

@@ -141,11 +141,7 @@ export default {
       </h4>
 
       <ul class="nav-links">
-<<<<<<< HEAD:app/assets/javascripts/environments/folder/environments_folder_view.vue
-        <li :class="{ active: scope === null || scope === 'available' }">
-=======
         <li :class="{ 'active': scope === null || scope === 'available' }">
->>>>>>> upstream/master:app/assets/javascripts/environments/folder/environments_folder_view.vue
           <a
             :href="availablePath"
             class="js-available-environments-folder-tab">
@@ -155,11 +151,7 @@ export default {
             </span>
           </a>
         </li>
-<<<<<<< HEAD:app/assets/javascripts/environments/folder/environments_folder_view.vue
-        <li :class="{ active : scope === 'stopped' }">
-=======
         <li :class="{ 'active' : scope === 'stopped' }">
->>>>>>> upstream/master:app/assets/javascripts/environments/folder/environments_folder_view.vue
           <a
             :href="stoppedPath"
             class="js-stopped-environments-folder-tab">