Make sure dist files are up-to-date

dist/css/bootstrapValidator.min.css

@@ -2,107 +2,7 @@
  * BootstrapValidator (http://bootstrapvalidator.com)
  * The best jQuery plugin to validate form fields. Designed to use with Bootstrap 3
  *
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
- * @version     v0.5.3-dev, built on 2014-10-06 8:02:42 AM
-=======
- * @version     v0.5.2-dev, built on 2014-09-18 9:55:01 PM
->>>>>>> Add built files for the rgbColor and keywordColor commits
-=======
- * @version     v0.5.2-dev, built on 2014-09-18 9:55:14 PM
->>>>>>> Add validator and test suite for rgba() color validation
-=======
- * @version     v0.5.2-dev, built on 2014-09-18 9:55:28 PM
->>>>>>> Add validator and test suite for hsl() color validation
-=======
- * @version     v0.5.2-dev, built on 2014-09-18 9:57:05 PM
->>>>>>> Add built files for the rgbColor and keywordColor commits
-=======
- * @version     v0.5.2-dev, built on 2014-09-18 9:57:12 PM
->>>>>>> Add validator and test suite for rgba() color validation
-=======
- * @version     v0.5.2-dev, built on 2014-09-18 9:57:19 PM
->>>>>>> Add validator and test suite for hsl() color validation
-=======
- * @version     v0.5.2-dev, built on 2014-09-18 9:57:27 PM
->>>>>>> Fix bug in form names for test suites for rgb, rgba and hsl
-=======
- * @version     v0.5.2-dev, built on 2014-09-18 9:57:34 PM
->>>>>>> Add validator and test suite for hsla() color validation
-=======
- * @version     v0.5.2-dev, built on 2014-09-18 9:57:40 PM
->>>>>>> Add test suite for keyword color validator
-=======
- * @version     v0.5.2-dev, built on 2014-09-18 9:57:46 PM
->>>>>>> Add validator and test suite for color validation
-=======
- * @version     v0.5.2-dev, built on 2014-09-18 10:00:59 PM
->>>>>>> Add built files for the rgbColor and keywordColor commits
-=======
- * @version     v0.5.2-dev, built on 2014-09-18 10:01:09 PM
->>>>>>> Add validator and test suite for rgba() color validation
-=======
- * @version     v0.5.2-dev, built on 2014-09-18 10:01:56 PM
->>>>>>> Add validator and test suite for hsl() color validation
-=======
- * @version     v0.5.2-dev, built on 2014-09-18 10:02:09 PM
->>>>>>> Add built files for the rgbColor and keywordColor commits
-=======
- * @version     v0.5.2-dev, built on 2014-09-18 10:02:15 PM
->>>>>>> Add validator and test suite for rgba() color validation
-=======
- * @version     v0.5.2-dev, built on 2014-09-18 10:02:22 PM
->>>>>>> Add validator and test suite for hsl() color validation
-=======
- * @version     v0.5.2-dev, built on 2014-09-18 10:03:43 PM
->>>>>>> Fix bug in form names for test suites for rgb, rgba and hsl
-=======
- * @version     v0.5.2-dev, built on 2014-09-18 10:03:49 PM
->>>>>>> Add validator and test suite for hsla() color validation
-=======
- * @version     v0.5.2-dev, built on 2014-09-18 10:03:55 PM
->>>>>>> Add test suite for keyword color validator
-=======
- * @version     v0.5.2-dev, built on 2014-09-18 10:04:01 PM
->>>>>>> Add validator and test suite for color validation
-=======
- * @version     v0.5.2-dev, built on 2014-09-18 10:04:11 PM
->>>>>>> Refactor color validators to one single entity
-=======
- * @version     v0.5.2-dev, built on 2014-09-18 10:04:23 PM
->>>>>>> Add dist files for Readd hexColor validator
-=======
- * @version     v0.5.2-dev, built on 2014-09-18 10:04:30 PM
->>>>>>> Refactor to use dynamic method calling substantialy reducing code length
-=======
- * @version     v0.5.2-dev, built on 2014-09-18 10:04:40 PM
->>>>>>> Refactor test suite for color validator.
-=======
- * @version     v0.5.2-dev, built on 2014-10-06 1:41:04 PM
->>>>>>> Add i18n for color types.
+ * @version     v0.5.3-dev, built on 2014-10-06 1:46:51 PM
  * @author      https://twitter.com/nghuuphuoc
  * @copyright   (c) 2013 - 2014 Nguyen Huu Phuoc
  * @license     MIT

dist/js/bootstrapValidator.js

@@ -2,107 +2,7 @@
  * BootstrapValidator (http://bootstrapvalidator.com)
  * The best jQuery plugin to validate form fields. Designed to use with Bootstrap 3
  *
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
- * @version     v0.5.3-dev, built on 2014-10-06 8:02:42 AM
-=======
- * @version     v0.5.2-dev, built on 2014-09-18 9:55:01 PM
->>>>>>> Add built files for the rgbColor and keywordColor commits
-=======
- * @version     v0.5.2-dev, built on 2014-09-18 9:55:14 PM
->>>>>>> Add validator and test suite for rgba() color validation
-=======
- * @version     v0.5.2-dev, built on 2014-09-18 9:55:28 PM
->>>>>>> Add validator and test suite for hsl() color validation
-=======
- * @version     v0.5.2-dev, built on 2014-09-18 9:57:05 PM
->>>>>>> Add built files for the rgbColor and keywordColor commits
-=======
- * @version     v0.5.2-dev, built on 2014-09-18 9:57:12 PM
->>>>>>> Add validator and test suite for rgba() color validation
-=======
- * @version     v0.5.2-dev, built on 2014-09-18 9:57:19 PM
->>>>>>> Add validator and test suite for hsl() color validation
-=======
- * @version     v0.5.2-dev, built on 2014-09-18 9:57:27 PM
->>>>>>> Fix bug in form names for test suites for rgb, rgba and hsl
-=======
- * @version     v0.5.2-dev, built on 2014-09-18 9:57:34 PM
->>>>>>> Add validator and test suite for hsla() color validation
-=======
- * @version     v0.5.2-dev, built on 2014-09-18 9:57:40 PM
->>>>>>> Add test suite for keyword color validator
-=======
- * @version     v0.5.2-dev, built on 2014-09-18 9:57:46 PM
->>>>>>> Add validator and test suite for color validation
-=======
- * @version     v0.5.2-dev, built on 2014-09-18 10:00:59 PM
->>>>>>> Add built files for the rgbColor and keywordColor commits
-=======
- * @version     v0.5.2-dev, built on 2014-09-18 10:01:09 PM
->>>>>>> Add validator and test suite for rgba() color validation
-=======
- * @version     v0.5.2-dev, built on 2014-09-18 10:01:56 PM
->>>>>>> Add validator and test suite for hsl() color validation
-=======
- * @version     v0.5.2-dev, built on 2014-09-18 10:02:09 PM
->>>>>>> Add built files for the rgbColor and keywordColor commits
-=======
- * @version     v0.5.2-dev, built on 2014-09-18 10:02:15 PM
->>>>>>> Add validator and test suite for rgba() color validation
-=======
- * @version     v0.5.2-dev, built on 2014-09-18 10:02:22 PM
->>>>>>> Add validator and test suite for hsl() color validation
-=======
- * @version     v0.5.2-dev, built on 2014-09-18 10:03:43 PM
->>>>>>> Fix bug in form names for test suites for rgb, rgba and hsl
-=======
- * @version     v0.5.2-dev, built on 2014-09-18 10:03:49 PM
->>>>>>> Add validator and test suite for hsla() color validation
-=======
- * @version     v0.5.2-dev, built on 2014-09-18 10:03:55 PM
->>>>>>> Add test suite for keyword color validator
-=======
- * @version     v0.5.2-dev, built on 2014-09-18 10:04:01 PM
->>>>>>> Add validator and test suite for color validation
-=======
- * @version     v0.5.2-dev, built on 2014-09-18 10:04:11 PM
->>>>>>> Refactor color validators to one single entity
-=======
- * @version     v0.5.2-dev, built on 2014-09-18 10:04:23 PM
->>>>>>> Add dist files for Readd hexColor validator
-=======
- * @version     v0.5.2-dev, built on 2014-09-18 10:04:30 PM
->>>>>>> Refactor to use dynamic method calling substantialy reducing code length
-=======
- * @version     v0.5.2-dev, built on 2014-09-18 10:04:40 PM
->>>>>>> Refactor test suite for color validator.
-=======
- * @version     v0.5.2-dev, built on 2014-10-06 1:41:04 PM
->>>>>>> Add i18n for color types.
+ * @version     v0.5.3-dev, built on 2014-10-06 1:46:51 PM
  * @author      https://twitter.com/nghuuphuoc
  * @copyright   (c) 2013 - 2014 Nguyen Huu Phuoc
  * @license     MIT