Resolve conflicts in board_service

See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3929

app/assets/javascripts/boards/services/board_service.js

@@ -12,7 +12,6 @@ export default class BoardService {
 
   generateBoardsPath(id) {
     return `${this.boardsEndpoint}${id ? `/${id}` : ''}.json`;
-<<<<<<< HEAD
   }
 
   generateIssuesPath(id) {
@@ -51,16 +50,6 @@ export default class BoardService {
 
   deleteBoard({ id }) {
     return axios.delete(this.generateBoardsPath(id));
-=======
-  }
-
-  generateIssuesPath(id) {
-    return `${this.listsEndpoint}${id ? `/${id}` : ''}/issues`;
-  }
-
-  static generateIssuePath(boardId, id) {
-    return `${gon.relative_url_root}/-/boards/${boardId ? `/${boardId}` : ''}/issues${id ? `/${id}` : ''}`;
->>>>>>> upstream/master
   }
 
   all() {
@@ -129,15 +118,12 @@ export default class BoardService {
 
   static getIssueInfo(endpoint) {
     return axios.get(endpoint);
-<<<<<<< HEAD
   }
 
   static updateWeight(endpoint, weight = null) {
     return axios.put(endpoint, {
       weight,
     });
-=======
->>>>>>> upstream/master
   }
 
   static toggleIssueSubscription(endpoint) {