fix merge conflicts, update bower.

KNIGHTTH0R · Feb 3, 2015 · 84d18b4 · 84d18b4
1 parent 578cb9b
commit 84d18b4
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 21 deletions.
diff --git a/bower.json b/bower.json
@@ -1,10 +1,11 @@
 {
   "name": "bxslider-4",
-  "version": "4.2.0",
+  "version": "4.2.1",
   "homepage": "http://bxslider.com",
   "license": "MIT",
   "main": [
     "dist/jquery.bxslider.js",
+    "dist/jquery.bxslider.min.js",
     "dist/jquery.bxslider.css",
     "dist/images/bx_loader.gif",
     "dist/images/controls.png"
@@ -15,11 +16,6 @@
     "jquery",
     "library"
   ],
-  "ignore": [
-    "src/**/*.*",
-    "docs/**/.*",
-    "*.md"
-  ],
   "dependencies": {
     "jquery": ">=1.6"
   }

diff --git a/dist/jquery.bxslider.css b/dist/jquery.bxslider.css
@@ -1,5 +1,5 @@
 /***
- * BxSlider v4.2.0 - Fully loaded, responsive content slider
+ * BxSlider v4.2.1 - Fully loaded, responsive content slider
  * http://bxslider.com
  *
  * Written by: Steven Wanderski, 2014

diff --git a/dist/jquery.bxslider.js b/dist/jquery.bxslider.js
@@ -1,5 +1,5 @@
 /***
- * BxSlider v4.2.0 - Fully loaded, responsive content slider
+ * BxSlider v4.2.1 - Fully loaded, responsive content slider
  * http://bxslider.com
  *
  * Copyright 2014, Steven Wanderski - http://stevenwanderski.com - http://bxcreative.com
@@ -1312,21 +1312,13 @@
 			// to keep it last no matter what screen size we end on
 			if (slider.active.last) { slider.active.index = getPagerQty() - 1; }
 			// if the active index (page) no longer exists due to the resize, simply set the index as last
-<<<<<<< HEAD:jquery.bxslider.js
-			if (slider.active.index >= getPagerQty()) slider.active.last = true;
-=======
 			if (slider.active.index >= getPagerQty()) { slider.active.last = true; }
->>>>>>> development:dist/jquery.bxslider.js
 			// if a pager is being displayed and a custom pager is not being used, update it
 			if(slider.settings.pager && !slider.settings.pagerCustom){
 				populatePager();
 				updatePagerActive(slider.active.index);
 			}
-<<<<<<< HEAD:jquery.bxslider.js
-		}
-=======
 		};
->>>>>>> development:dist/jquery.bxslider.js
 
 		/**
 		 * Destroy the current instance of the slider (revert everything back to original state)

diff --git a/dist/jquery.bxslider.min.js b/dist/jquery.bxslider.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bxslider",
-  "version": "4.2.0",
+  "version": "4.2.1",
   "author": "Steven Wanderski <steven@bxcreative.com>",
   "homepage": "http://bxslider.com",
   "private": true,

diff --git a/readme.md b/readme.md
@@ -1,4 +1,4 @@
-#bxSlider 4.2.0
+#bxSlider 4.2.1
 ##The fully-loaded, responsive jQuery content slider
 
 ###Why should I use this slider?
@@ -561,6 +561,10 @@ slider.destroySlider();
 
 ## Changelog
 
+### Version 4.2.1
+* Fix: Merge Conflict in dist
+* Fix: modified bower.json
+
 ### Version 4.2.0
 * Fix: Reverse #714, fixes #722.
 * Fix: Repo Tag #729

diff --git a/src/js/jquery.bxslider.js b/src/js/jquery.bxslider.js
@@ -1,5 +1,5 @@
 /***
- * BxSlider v4.2.0 - Fully loaded, responsive content slider
+ * BxSlider v4.2.1 - Fully loaded, responsive content slider
  * http://bxslider.com
  *
  * Copyright 2014, Steven Wanderski - http://stevenwanderski.com - http://bxcreative.com

diff --git a/src/less/jquery.bxslider.less b/src/less/jquery.bxslider.less
@@ -1,5 +1,5 @@
 /***
- * BxSlider v4.2.0 - Fully loaded, responsive content slider
+ * BxSlider v4.2.1 - Fully loaded, responsive content slider
  * http://bxslider.com
  *
  * Written by: Steven Wanderski, 2014