From 540b1197a6936f94b963b0d6e237daedcf7b0e37 Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Wed, 14 Dec 2016 18:22:03 -0800
Subject: [PATCH] fix(form): fix merge errors

---
 modules/@angular/forms/src/directives.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/@angular/forms/src/directives.ts b/modules/@angular/forms/src/directives.ts
index f43b635cd6..11e16c5183 100644
--- 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,