Resolve conflicts in spec/javascripts/boards/mock_data.js

spec/javascripts/boards/mock_data.js

 import BoardService from '~/boards/services/board_service';
 
-<<<<<<< HEAD
 export const boardObj = {
   id: 1,
   name: 'test',
   milestone_id: null,
 };
 
-=======
->>>>>>> upstream/master
 export const listObj = {
   id: 300,
   position: 0,