Commit d5f38961 authored by Kushal Pandya's avatar Kushal Pandya

Resolve merge conflicts for EE-specific changes

parent 5a91632d
......@@ -6,10 +6,7 @@ import GfmAutoComplete from './gfm_auto_complete';
import ZenMode from './zen_mode';
import AutoWidthDropdownSelect from './issuable/auto_width_dropdown_select';
import { parsePikadayDate, pikadayToString } from './lib/utils/datetime_utility';
<<<<<<< HEAD
import groupsSelect from './groups_select';
=======
>>>>>>> upstream/master
export default class IssuableForm {
constructor(form) {
......@@ -24,10 +21,7 @@ export default class IssuableForm {
gl.GfmAutoComplete && gl.GfmAutoComplete.dataSources,
).setup();
this.usersSelect = new UsersSelect();
<<<<<<< HEAD
groupsSelect();
=======
>>>>>>> upstream/master
this.zenMode = new ZenMode();
this.titleField = this.form.find('input[name*="[title]"]');
......
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