Fix for Conflict on hasTriggeredBy

672419bb · Tim Zallmann · c083e2e0 · 672419bb
Commit 672419bb authored Jan 23, 2018 by Tim Zallmann
Show 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', () => {
      propsData: {
        title: 'foo',
        jobs: mockJobs,
-<<<<<<< HEAD
        hasTriggeredBy: false,
-=======
->>>>>>> upstream/master
      },
    }).$mount();
  });