Fix conflicts for environment code

app/assets/javascripts/environments/stores/environments_store.js

@@ -223,14 +223,10 @@ export default class EnvironmentsStore {
 
     return updatedEnvironments;
   }
-<<<<<<< HEAD
-=======
 
   getOpenFolders() {
     const environments = this.state.environments;
 
     return environments.filter(env => env.isFolder && env.isOpen);
   }
-
->>>>>>> upstream/master
 }

spec/javascripts/environments/environments_store_spec.js

@@ -157,7 +157,6 @@ describe('Store', () => {
     });
   });
 
-<<<<<<< HEAD
   describe('deploy boards', () => {
     beforeEach(() => {
       const environment = {
@@ -177,14 +176,15 @@ describe('Store', () => {
     it('should store deploy board data for given environment id', () => {
       store.storeDeployBoard(1, deployBoardMockData);
       expect(store.state.environments[0].deployBoardData).toEqual(deployBoardMockData);
-=======
+    });
+  });
+
   describe('getOpenFolders', () => {
     it('should return open folder', () => {
       store.storeEnvironments(serverData);
 
       store.toggleFolder(store.state.environments[1]);
       expect(store.getOpenFolders()[0]).toEqual(store.state.environments[1]);
->>>>>>> upstream/master
     });
   });
 });