Commit 4fd538ec authored by Valery Sizov's avatar Valery Sizov

Resolve app/assets/javascripts/notes.js

parent 79fcd7b9
......@@ -21,10 +21,6 @@ import CommentTypeToggle from './comment_type_toggle';
import GLForm from './gl_form';
import loadAwardsHandler from './awards_handler';
import Autosave from './autosave';
<<<<<<< HEAD
import './dropzone_input';
=======
>>>>>>> ce-com/master
import TaskList from './task_list';
import { ajaxPost, isInViewport, getPagePath, scrollToElement, isMetaKey } from './lib/utils/common_utils';
import imageDiffHelper from './image_diff/helpers/index';
......
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