Merge pull request #120 from kesse/feature/updateSliderVersion

Feature/update slider version
seiyria · Jan 22, 2016 · f645a8f · f645a8f
2 parents 44231e0 + 1f82062
commit f645a8f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,4 +8,6 @@ node_modules
 # jetbrains #
 #############
 .idea
-*.iml
+*.iml
+
+.DS_STORE
diff --git a/bower.json b/bower.json
@@ -22,7 +22,7 @@
     "tests"
   ],
   "dependencies": {
-    "seiyria-bootstrap-slider": ">= 5.2 < 6.0",
+    "seiyria-bootstrap-slider": ">= 5.2 < 7.0",
     "angular": ">= 1.3 < 1.5"
   },
   "devDependencies": {

diff --git a/test.html b/test.html
@@ -204,7 +204,7 @@
 <script src="bower_components/jquery/dist/jquery.js"></script>
 <script src="bower_components/angular/angular.js"></script>
 <script src="bower_components/bootstrap/dist/js/bootstrap.js"></script>
-<script src="bower_components/seiyria-bootstrap-slider/js/bootstrap-slider.js"></script>
+<script src="bower_components/seiyria-bootstrap-slider/dist/bootstrap-slider.js"></script>
 
 <!-- angular-slider include -->
 <script src="slider.js"></script>