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

Signed-off-by: Rémy Coutable <remy@rymai.me>

Resolve conflict in spec/javascripts/environments/environments_app_spec.js
Signed-off-by: Rémy Coutable <remy@rymai.me>
902f588f · Rémy Coutable · 3c50e0ed · 902f588f
Commit 902f588f authored Nov 23, 2017 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

spec/javascripts/environments/environments_app_spec.js spec/javascripts/environments/environments_app_spec.js +0 -3

No files found.
--- a/spec/javascripts/environments/environments_app_spec.js
+++ b/spec/javascripts/environments/environments_app_spec.js
@@ -128,10 +128,7 @@ describe('Environment', () => {
          setTimeout(() => {
            spyOn(component, 'updateContent');
            component.$el.querySelector('.js-environments-tab-stopped').click();
-<<<<<<< HEAD:spec/javascripts/environments/environments_app_spec.js

-=======
->>>>>>> origin/master:spec/javascripts/environments/environments_app_spec.js
            expect(component.updateContent).toHaveBeenCalledWith({ scope: 'stopped', page: '1' });
            done();
          });