浏览代码

Update README, remove conflicts

nghuuphuoc 11 年之前
父节点
当前提交
54634d5b81
共有 1 个文件被更改,包括 0 次插入7 次删除
  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
 view, the input field name will be 'user[email]'. The syntax for these is somewhat different as shown below:
-<<<<<<< HEAD
 
-=======
->>>>>>> c025cbea8fc37eb3c7b6c2d3dad0b670a5de40b6
 ```javascript
 $(form).bootstrapValidator({
     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.
 
 ## Build