Resolve conflicts with gfm_auto_complete imports

See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1920

app/assets/javascripts/dispatcher.js

@@ -56,11 +56,8 @@ import BlobViewer from './blob/viewer/index';
 import GeoNodes from './geo_nodes';
 import ServiceDeskRoot from './projects/settings_service_desk/service_desk_root';
 import AutoWidthDropdownSelect from './issuable/auto_width_dropdown_select';
-<<<<<<< HEAD
-=======
 import UsersSelect from './users_select';
 import RefSelectDropdown from './ref_select_dropdown';
->>>>>>> upstream/master
 import GfmAutoComplete from './gfm_auto_complete';
 
 const ShortcutsBlob = require('./shortcuts_blob');

app/assets/javascripts/issuable_form.js

@@ -6,10 +6,7 @@
 /* global dateFormat */
 /* global Pikaday */
 
-<<<<<<< HEAD
-=======
 import UsersSelect from './users_select';
->>>>>>> upstream/master
 import GfmAutoComplete from './gfm_auto_complete';
 
 (function() {