fixed sidebar_mediator & board_store_spec conflicts

[ci skip]

app/assets/javascripts/sidebar/sidebar_mediator.js

-<<<<<<< HEAD
 import Store from 'ee/sidebar/stores/sidebar_store';
-=======
->>>>>>> upstream/master
 import { visitUrl } from '../lib/utils/url_utility';
 import Flash from '../flash';
 import Service from './services/sidebar_service';

spec/javascripts/boards/boards_store_spec.js

@@ -8,10 +8,6 @@
 
 import Vue from 'vue';
 import Cookies from 'js-cookie';
-<<<<<<< HEAD
-=======
-
->>>>>>> upstream/master
 import '~/boards/models/issue';
 import '~/boards/models/label';
 import '~/boards/models/list';