merge

index.html

@@ -579,6 +579,7 @@ $('#disable-switch').bootstrapSwitch('setActive', false);  // true || false</pre
             <div class="bs-docs-example">
                 <div class="control-group">
                      <div class="controls">
+<<<<<<< HEAD
                         <label for="option1">Option 1</label>
                         <div class="make-switch radio1 radio-no-uncheck">
                             <input id="option1" type="radio" name="radio1" value="option1">
@@ -590,6 +591,19 @@ $('#disable-switch').bootstrapSwitch('setActive', false);  // true || false</pre
                         <label for="option3">Option 3</label>
                         <div class="make-switch radio1 radio-no-uncheck">
                             <input id="option3" type="radio" name="radio1" value="option3">
+=======
+                        <h5>Option 1</h5>
+                        <div id="option1" class="make-switch radio1 radio-no-uncheck">
+                            <input type="radio" name="radio1" value="option1">
+                        </div>
+                        <h5>Option 2</h5>
+                        <div id="option2" class="make-switch radio1 radio-no-uncheck">
+                            <input type="radio" name="radio1" value="option2">
+                        </div>
+                        <h5>Option 3</h5>
+                        <div id="option3" class="make-switch radio1 radio-no-uncheck">
+                            <input type="radio" name="radio1" value="option3">
+>>>>>>> aeebf92e31a73c9f5ec8e0f8db095ebf194344ff
                         </div>
                      </div>
                 </div>
@@ -597,6 +611,7 @@ $('#disable-switch').bootstrapSwitch('setActive', false);  // true || false</pre
             <pre class="prettyprint linenums">
 &lt;div class="control-group">
     &lt;div class="controls">
+<<<<<<< HEAD
         &lt;label for="option1">Option 1&lt;/label>
         &lt;div class="make-switch radio1 radio-no-uncheck">
             &lt;input id="option1" type="radio" name="radio1" value="option1">
@@ -608,6 +623,19 @@ $('#disable-switch').bootstrapSwitch('setActive', false);  // true || false</pre
         &lt;label for="option3">Option 3&lt;/label>
         &lt;div class="make-switch radio1 radio-no-uncheck">
             &lt;input id="option3" type="radio" name="radio1" value="option3">
+=======
+        &lt;h5>Option 1&lt;/h5>
+        &lt;div id="option1" class="make-switch radio1 radio-no-uncheck">
+            &lt;input type="radio" name="radio1" value="option1">
+        &lt;/div>
+        &lt;h5>Option 2&lt;/h5>
+        &lt;div id="option2" class="make-switch radio1 radio-no-uncheck">
+            &lt;input type="radio" name="radio1" value="option2">
+        &lt;/div>
+        &lt;h5>Option 3&lt;/h5>
+        &lt;div id="option3" class="make-switch radio1 radio-no-uncheck">
+            &lt;input type="radio" name="radio1" value="option3">
+>>>>>>> aeebf92e31a73c9f5ec8e0f8db095ebf194344ff
         &lt;/div>
     &lt;/div>
 &lt;/div>            
@@ -638,6 +666,7 @@ $('#disable-switch').bootstrapSwitch('setActive', false);  // true || false</pre
             <div class="bs-docs-example">
                 <div class="control-group">
                      <div class="controls">
+<<<<<<< HEAD
                         <label for="option11">Option 1</label>
                         <div class="make-switch radio2">
                             <input id="option11" type="radio" name="radio2" value="option11">
@@ -650,12 +679,27 @@ $('#disable-switch').bootstrapSwitch('setActive', false);  // true || false</pre
                         <div class="make-switch radio2">
                             <input id="option13" type="radio" name="radio2" value="option13">
                         </div>
+=======
+                        <h5>Option 1</h5>
+                            <div id="option11" class="make-switch radio2">
+                                <input type="radio" name="radio2" value="option11">
+                            </div>
+                        <h5>Option 2</h5>
+                            <div id="option12" class="make-switch radio2">
+                                <input type="radio" name="radio2" value="option12" checked="checked">
+                            </div>
+                        <h5>Option 3</h5>
+                            <div id="option13" class="make-switch radio2">
+                                <input type="radio" name="radio2" value="option13">
+                            </div>
+>>>>>>> aeebf92e31a73c9f5ec8e0f8db095ebf194344ff
                      </div>
                 </div>
             </div>
             <pre class="prettyprint linenums">
 &lt;div class="control-group">
     &lt;div class="controls">
+<<<<<<< HEAD
         &lt;label for="option11">Option 1&lt;/label>
         &lt;div class="make-switch radio2">
             &lt;input id="option11" type="radio" name="radio2" value="option1">
@@ -668,6 +712,20 @@ $('#disable-switch').bootstrapSwitch('setActive', false);  // true || false</pre
         &lt;div class="make-switch radio2">
             &lt;input id="option13" type="radio" name="radio2" value="option3">
         &lt;/div>
+=======
+        &lt;h5>Option 1&lt;/h5>
+            &lt;div id="option11" class="make-switch radio2">
+                &lt;input type="radio" name="radio2" value="option1">
+            &lt;/div>
+        &lt;h5>Option 2&lt;/h5>
+            &lt;div id="option12" class="make-switch radio2">
+                &lt;input type="radio" name="radio2" value="option2" checked="checked">
+            &lt;/div>
+        &lt;h5>Option 3&lt;/h5>
+            &lt;div id="option13" class="make-switch radio2">
+                &lt;input type="radio" name="radio2" value="option3">
+            &lt;/div>
+>>>>>>> aeebf92e31a73c9f5ec8e0f8db095ebf194344ff
     &lt;/div>
 &lt;/div>            
 &lt;script>