Browse Source

Update README, remove conflicts

nghuuphuoc 11 years ago
parent
commit
54634d5b81
1 changed files with 0 additions and 7 deletions
  1. 0 7
      README.md

+ 0 - 7
README.md

@@ -296,10 +296,7 @@ $(form).bootstrapValidator({
 
 
 For Rails, the input field is constructed from model name and field name. For Example, User have email as field, when form helper render
 For Rails, the input field is constructed from model name and field name. For Example, User have email as field, when form helper render
 view, the input field name will be 'user[email]'. The syntax for these is somewhat different as shown below:
 view, the input field name will be 'user[email]'. The syntax for these is somewhat different as shown below:
-<<<<<<< HEAD
 
 
-=======
->>>>>>> c025cbea8fc37eb3c7b6c2d3dad0b670a5de40b6
 ```javascript
 ```javascript
 $(form).bootstrapValidator({
 $(form).bootstrapValidator({
     fields: {
     fields: {
@@ -313,10 +310,6 @@ $(form).bootstrapValidator({
 });
 });
 ```
 ```
 
 
-<<<<<<< HEAD
-=======
-
->>>>>>> c025cbea8fc37eb3c7b6c2d3dad0b670a5de40b6
 To see how built-in validators are developed, you can look at their sources located at the [```src/js/validator```](src/js/validator) directory.
 To see how built-in validators are developed, you can look at their sources located at the [```src/js/validator```](src/js/validator) directory.
 
 
 ## Build
 ## Build