Manual diff.

js/bootstrap-multiselect.js

@@ -60,11 +60,7 @@
 		}
 		
 		this.$container = $(this.options.buttonContainer)
-<<<<<<< HEAD
-			.append('<button type="button" class="multiselect dropdown-toggle ' + this.options.buttonClass + '" data-toggle="dropdown">' + this.options.buttonText($('option:selected', select)) + '</button>')
-=======
 			.append('<button type="button" class="multiselect dropdown-toggle ' + this.options.buttonClass + '" data-toggle="dropdown">' + this.options.buttonText($('option:selected', select), this.$select) + '</button>')
->>>>>>> origin/gh-pages
 			.append('<ul class="dropdown-menu"></ul>');
 
 		if (this.options.buttonWidth) {
@@ -95,11 +91,7 @@
 			// Default text function will either print 'None selected' in case no option is selected,
 			// or a list of the selected options up to a length of 3 selected options.
 			// If more than 3 options are selected, the number of selected options is printed.
-<<<<<<< HEAD
-			buttonText: function(options) {
-=======
 			buttonText: function(options, select) {
->>>>>>> origin/gh-pages
 				if (options.length == 0) {
 					return 'None selected <b class="caret"></b>';
 				}
@@ -194,11 +186,7 @@
 				}
 				
 				var options = $('option:selected', this.$select);
-<<<<<<< HEAD
-				$('button', this.$container).html(this.options.buttonText(options));
-=======
 				$('button', this.$container).html(this.options.buttonText(options, this.$select));
->>>>>>> origin/gh-pages
 
 				this.options.onChange(option, checked);
 			}, this));
@@ -227,11 +215,7 @@
 				}
 			}, this));
 
-<<<<<<< HEAD
-			$('button', this.$container).html(this.options.buttonText($('option:selected', this.$select)));
-=======
 			$('button', this.$container).html(this.options.buttonText($('option:selected', this.$select), this.$select));
->>>>>>> origin/gh-pages
 		},
 		
 		// Select an option by its value.
@@ -246,11 +230,7 @@
 			option.prop('selected', 'selected');
 			
 			var options = $('option:selected', this.$select);
-<<<<<<< HEAD
-			$('button', this.$container).html(this.options.buttonText(options));
-=======
 			$('button', this.$container).html(this.options.buttonText(options, this.$select));
->>>>>>> origin/gh-pages
 		},
 		
 		// Deselect an option by its value.
@@ -265,11 +245,7 @@
 			option.removeProp('selected');
 			
 			var options = $('option:selected', this.$select);
-<<<<<<< HEAD
-			$('button', this.$container).html(this.options.buttonText(options));
-=======
 			$('button', this.$container).html(this.options.buttonText(options, this.$select));
->>>>>>> origin/gh-pages
 		},
 		
 		// Rebuild the whole dropdown menu.