Skip to content

G
gitlab-ce
Commit 498887cc authored by Valery Sizov's avatar Valery Sizov
Browse files
Options

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

parent 7c526a73
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 7 deletions
app/assets/javascripts/sidebar/sidebar_bundle.js
View file @ 498887cc
<<<<<<< HEAD
import mountSidebarEE from 'ee/sidebar/mount_sidebar'; import mountSidebarEE from 'ee/sidebar/mount_sidebar';
import Mediator from 'ee/sidebar/sidebar_mediator'; import Mediator from 'ee/sidebar/sidebar_mediator';
=======
import Mediator from './sidebar_mediator';
>>>>>>> upstream/master
import mountSidebar from './mount_sidebar'; import mountSidebar from './mount_sidebar';
function domContentLoaded() { function domContentLoaded() {
...@@ -12,10 +8,7 @@ function domContentLoaded() { ...@@ -12,10 +8,7 @@ function domContentLoaded() {
mediator.fetch(); mediator.fetch();
mountSidebar(mediator); mountSidebar(mediator);
<<<<<<< HEAD
mountSidebarEE(mediator); mountSidebarEE(mediator);
=======
>>>>>>> upstream/master
} }
document.addEventListener('DOMContentLoaded', domContentLoaded); document.addEventListener('DOMContentLoaded', domContentLoaded);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7