Skip to content

G
gitlab-ce
Commit fbc87366 authored by Mario de la Ossa's avatar Mario de la Ossa
Browse files
Options

resolve conflicts on app/assets/javascripts/main.js

parent f8de4dc3
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
app/assets/javascripts/main.js
View file @ fbc87366
...@@ -33,12 +33,9 @@ import './projects_dropdown'; ...@@ -33,12 +33,9 @@ import './projects_dropdown';
import './render_gfm'; import './render_gfm';
import initBreadcrumbs from './breadcrumb'; import initBreadcrumbs from './breadcrumb';
<<<<<<< HEAD
// EE-only scripts // EE-only scripts
import 'ee/main'; import 'ee/main';
=======
>>>>>>> upstream/master
import initDispatcher from './dispatcher'; import initDispatcher from './dispatcher';
// eslint-disable-next-line global-require, import/no-commonjs // eslint-disable-next-line global-require, import/no-commonjs
......
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