Commit f72f95c9 authored by Mike Greiling's avatar Mike Greiling

Resolve conflicts in app/assets/javascripts/main.js

parent 15bb6daa
...@@ -30,12 +30,9 @@ import './projects_dropdown'; ...@@ -30,12 +30,9 @@ import './projects_dropdown';
import initBreadcrumbs from './breadcrumb'; import initBreadcrumbs from './breadcrumb';
import initDispatcher from './dispatcher'; import initDispatcher from './dispatcher';
<<<<<<< HEAD
// EE-only scripts // EE-only scripts
import 'ee/main'; // eslint-disable-line import/first import 'ee/main'; // eslint-disable-line import/first
=======
>>>>>>> upstream/master
// expose jQuery as global (TODO: remove these) // expose jQuery as global (TODO: remove these)
window.jQuery = jQuery; window.jQuery = jQuery;
window.$ = jQuery; window.$ = jQuery;
......
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