fix(form): fix merge errors

vicb · vicb · commit 540b1197a693 · 2016-12-14T18:22:03.000-08:00
diff --git a/modules/@angular/forms/src/directives.ts b/modules/@angular/forms/src/directives.ts
@@ -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,
