Resolve conflict in stage_column_component_spec.js

41f353dc · Winnie Hellmann · 53bb8fc6 · 41f353dc
Commit 41f353dc authored Oct 18, 2018 by Winnie Hellmann
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

spec/javascripts/pipelines/graph/stage_column_component_spec.js ...avascripts/pipelines/graph/stage_column_component_spec.js +0 -3

No files found.
--- a/spec/javascripts/pipelines/graph/stage_column_component_spec.js
+++ b/spec/javascripts/pipelines/graph/stage_column_component_spec.js
@@ -35,10 +35,7 @@ describe('stage column component', () => {
    component = mountComponent(StageColumnComponent, {
      title: 'foo',
      groups: mockGroups,
-<<<<<<< HEAD
      hasTriggeredBy: false,
-=======
->>>>>>> upstream/master
    });
  });