[CE->EE] Resolve app/assets/javascripts/sidebar/sidebar_bundle.js[ci skip]

498887cc · Valery Sizov · 7c526a73 · 498887cc
Commit 498887cc authored Dec 05, 2017 by Valery Sizov
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 7 deletions

app/assets/javascripts/sidebar/sidebar_bundle.js app/assets/javascripts/sidebar/sidebar_bundle.js +0 -7

No files found.
--- a/app/assets/javascripts/sidebar/sidebar_bundle.js
+++ b/app/assets/javascripts/sidebar/sidebar_bundle.js
-<<<<<<< HEAD
 import mountSidebarEE from 'ee/sidebar/mount_sidebar';
 import Mediator from 'ee/sidebar/sidebar_mediator';
-=======
-import Mediator from './sidebar_mediator';
->>>>>>> upstream/master
 import mountSidebar from './mount_sidebar';

 function domContentLoaded() {
@@ -12,10 +8,7 @@ function domContentLoaded() {
  mediator.fetch();

  mountSidebar(mediator);
-<<<<<<< HEAD
  mountSidebarEE(mediator);
-=======
->>>>>>> upstream/master
 }

 document.addEventListener('DOMContentLoaded', domContentLoaded);