fix(form): fix merge errors

This commit is contained in:
Victor Berchet
2016-12-14 18:22:03 -08:00
parent d30cc8461b
commit 540b1197a6

View File

@ -44,7 +44,6 @@ export {NgSelectOption, SelectControlValueAccessor} from './directives/select_co
export {NgSelectMultipleOption, SelectMultipleControlValueAccessor} from './directives/select_multiple_control_value_accessor';
export const SHARED_FORM_DIRECTIVES: Type<any>[] = [
NgNovalidate,
NgSelectOption,
NgSelectMultipleOption,
DefaultValueAccessor,