chore: 🤖 fix docs merge conflict

BREAKING CHANGE: No
ngneat · Jun 11, 2020 · 998f32d · 998f32d
1 parent 5a8daea
commit 998f32d
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -174,14 +174,7 @@ The library adds a `form-submitted` to the submitted form. You can use it to sty
 }
 ```
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-- # `controlErrorsOnBlur` - To modify the error display behavior and show the errors on submission alone, set the following input:
-- `controlErrorsOnBlur` - To modify the error display behavior and show the errors on submission alone, set the following input:
- > > > > > > > # master
 - `controlErrorsOnBlur` - To modify the error display behavior and show the errors on submission alone, set the following input:
- > > > > > > > fix: 🐛 customErrors + blurPredicate
 
 ```html
 <input [controlErrorsOnBlur]="false" formControlName="name" />