Resolve app/assets/javascripts/notes.js

app/assets/javascripts/notes.js

@@ -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';