Resolve conflict in spec/javascripts/environments/environments_app_spec.js

spec/javascripts/environments/environments_app_spec.js

@@ -107,7 +107,6 @@ describe('Environment', () => {
             expect(component.updateContent).toHaveBeenCalledWith({ scope: 'stopped', page: '1' });
             done();
           }, 0);
-<<<<<<< HEAD
         });
       });
 
@@ -119,8 +118,6 @@ describe('Environment', () => {
             ).toBeDefined();
             done();
           }, 0);
-=======
->>>>>>> upstream/master
         });
       });
     });