Add validator and test suite for rgba() color validation

dist/css/bootstrapValidator.min.css

@@ -13,6 +13,7 @@
 <<<<<<< 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
@@ -47,6 +48,9 @@
 =======
  * @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
  * @author      https://twitter.com/nghuuphuoc
  * @copyright   (c) 2013 - 2014 Nguyen Huu Phuoc
  * @license     MIT

dist/js/bootstrapValidator.js

@@ -13,6 +13,7 @@
 <<<<<<< 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
@@ -47,6 +48,9 @@
 =======
  * @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
  * @author      https://twitter.com/nghuuphuoc
  * @copyright   (c) 2013 - 2014 Nguyen Huu Phuoc
  * @license     MIT

dist/js/bootstrapValidator.min.js

@@ -13,6 +13,7 @@
 <<<<<<< 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
@@ -47,6 +48,9 @@
 =======
  * @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
  * @author      https://twitter.com/nghuuphuoc
  * @copyright   (c) 2013 - 2014 Nguyen Huu Phuoc
  * @license     MIT

test/spec.js

@@ -7015,7 +7015,11 @@ describe('rgbaColor', function() {
     beforeEach(function() {
         var html = [
             '<div class="container">',
+<<<<<<< HEAD
                 '<form class="form-horizontal" id="rgbaColorForm">',
+=======
+                '<form class="form-horizontal" id="rbgColorForm">',
+>>>>>>> Add validator and test suite for rgba() color validation
                     '<div class="form-group">',
                         '<input type="text" name="rgba" data-bv-rgbacolor />',
                     '</div>',
@@ -7024,14 +7028,24 @@ describe('rgbaColor', function() {
         ].join('\n');
 
         $(html).appendTo('body');
+<<<<<<< HEAD
         $('#rgbaColorForm').bootstrapValidator();
 
         this.bv          = $('#rgbaColorForm').data('bootstrapValidator');
+=======
+        $('#rbgColorForm').bootstrapValidator();
+
+        this.bv          = $('#rbgColorForm').data('bootstrapValidator');
+>>>>>>> Add validator and test suite for rgba() color validation
         this.$rgbaColor = this.bv.getFieldElements('rgba');
     });
 
     afterEach(function() {
+<<<<<<< HEAD
         $('#rgbaColorForm').bootstrapValidator('destroy').parent().remove();
+=======
+        $('#rbgColorForm').bootstrapValidator('destroy').parent().remove();
+>>>>>>> Add validator and test suite for rgba() color validation
     });
 
     it('accept rgba()', function() {

test/spec/validator/rgbaColor.js

@@ -3,7 +3,11 @@ describe('rgbaColor', function() {
     beforeEach(function() {
         var html = [
             '<div class="container">',
+<<<<<<< HEAD
                 '<form class="form-horizontal" id="rgbaColorForm">',
+=======
+                '<form class="form-horizontal" id="rbgColorForm">',
+>>>>>>> Add validator and test suite for rgba() color validation
                     '<div class="form-group">',
                         '<input type="text" name="rgba" data-bv-rgbacolor />',
                     '</div>',
@@ -12,14 +16,24 @@ describe('rgbaColor', function() {
         ].join('\n');
 
         $(html).appendTo('body');
+<<<<<<< HEAD
         $('#rgbaColorForm').bootstrapValidator();
 
         this.bv          = $('#rgbaColorForm').data('bootstrapValidator');
+=======
+        $('#rbgColorForm').bootstrapValidator();
+
+        this.bv          = $('#rbgColorForm').data('bootstrapValidator');
+>>>>>>> Add validator and test suite for rgba() color validation
         this.$rgbaColor = this.bv.getFieldElements('rgba');
     });
 
     afterEach(function() {
+<<<<<<< HEAD
         $('#rgbaColorForm').bootstrapValidator('destroy').parent().remove();
+=======
+        $('#rbgColorForm').bootstrapValidator('destroy').parent().remove();
+>>>>>>> Add validator and test suite for rgba() color validation
     });
 
     it('accept rgba()', function() {