Resolve conflict in app/assets/javascripts/boards/stores/boards_store.js

app/assets/javascripts/boards/stores/boards_store.js

@@ -5,10 +5,7 @@ import $ from 'jquery';
 import _ from 'underscore';
 import Vue from 'vue';
 import Cookies from 'js-cookie';
-<<<<<<< HEAD
 import BoardsStoreEE from 'ee/boards/stores/boards_store_ee';
-=======
->>>>>>> upstream/master
 import { getUrlParamsArray, parseBoolean } from '~/lib/utils/common_utils';
 
 const boardsStore = {