Fix conflicts for spec/javascripts/boards/mock_data.js

spec/javascripts/boards/mock_data.js

 /* global BoardService */
-<<<<<<< HEAD
 
 export const boardObj = {
   id: 1,
@@ -7,8 +6,6 @@ export const boardObj = {
   milestone_id: null,
 };
 
-=======
->>>>>>> upstream/master
 export const listObj = {
   id: 300,
   position: 0,
@@ -49,15 +46,12 @@ export const BoardsMockData = {
         },
       ],
     },
-<<<<<<< HEAD
     '/test/issue-boards/milestones.json': [
       {
         id: 1,
         title: 'test',
       },
     ],
-=======
->>>>>>> upstream/master
   },
   POST: {
     '/test/-/boards/1/lists': listObj,