fixed conflicts in `mock_data.js`

[ci skip]

fixed conflicts in `mock_data.js`
[ci skip]
ef76c6d3 · Phil Hughes · 54c44dbc · ef76c6d3
Commit ef76c6d3 authored Jan 12, 2018 by Phil Hughes
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

spec/javascripts/boards/mock_data.js spec/javascripts/boards/mock_data.js +0 -3

No files found.
--- a/spec/javascripts/boards/mock_data.js
+++ b/spec/javascripts/boards/mock_data.js
 /* global BoardService */
 /* eslint-disable comma-dangle, no-unused-vars, quote-props */
 import _ from 'underscore';
-<<<<<<< HEAD

 export const boardObj = {
  id: 1,
  name: 'test',
  milestone_id: null,
 };
-=======
->>>>>>> upstream/master

 export const listObj = {
  id: 300,