1.8.0

kenwheeler · Sep 12, 2017 · f9a8733 · f9a8733
1 parent 8ccd846
commit f9a8733
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 8 deletions.
diff --git a/README.markdown b/README.markdown
@@ -21,16 +21,20 @@ to serve the files as close, and fast as possible to your users:
 
 Just add a link to the css file in your `<head>`:
 
+<<<<<<< HEAD
 ```html
 <link rel="stylesheet" type="text/css" href="//cdn.jsdelivr.net/gh/kenwheeler/slick@1.7.1/slick/slick.css"/>
+=======
+<link rel="stylesheet" type="text/css" href="//cdn.jsdelivr.net/gh/kenwheeler/slick@1.7.2/slick/slick.css"/>
+>>>>>>> 1.7.2
 <!-- Add the slick-theme.css if you want default styling -->
-<link rel="stylesheet" type="text/css" href="//cdn.jsdelivr.net/gh/kenwheeler/slick@1.7.1/slick/slick-theme.css"/>
+<link rel="stylesheet" type="text/css" href="//cdn.jsdelivr.net/gh/kenwheeler/slick@1.7.2/slick/slick-theme.css"/>
 ```
 
 Then, before your closing ```<body>``` tag add:
 
 ```html
-<script type="text/javascript" src="//cdn.jsdelivr.net/gh/kenwheeler/slick@1.7.1/slick/slick.min.js"></script>
+<script type="text/javascript" src="//cdn.jsdelivr.net/gh/kenwheeler/slick@1.7.2/slick/slick.min.js"></script>
 ```
 
 #### Package Managers

diff --git a/component.json b/component.json
@@ -2,7 +2,7 @@
     "name": "slick",
     "repo": "kenwheeler/slick",
     "description": "the last carousel you'll ever need",
-    "version": "1.7.1",
+    "version": "1.8.0",
     "keywords": ["ui", "jquery", "carousel", "responsive", "slider"],
     "dependencies": {
         "component/jquery": "*"

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "slick-carousel",
-  "version": "1.7.1",
+  "version": "1.8.0",
   "description": "the last carousel you'll ever need",
   "main": "slick/slick.js",
   "repository": {
@@ -39,6 +39,6 @@
     "url": "https://github.com/kenwheeler/slick/issues"
   },
   "peerDependencies": {
-    "jquery": ">=1.7.2"
+    "jquery": ">=1.8.0"
   }
 }
diff --git a/slick.jquery.json b/slick.jquery.json
@@ -9,7 +9,7 @@
         "touch",
         "mobile"
     ],
-    "version": "1.7.1",
+    "version": "1.8.0",
     "author": {
         "name": "Ken Wheeler",
         "url": "http://kenwheeler.github.io"

diff --git a/slick/slick.js b/slick/slick.js
@@ -6,7 +6,7 @@
 |___/_|_|\___|_|\_(_)/ |___/
                    |__/
 
- Version: 1.7.1
+ Version: 1.8.0
   Author: Ken Wheeler
  Website: http://kenwheeler.github.io
     Docs: http://kenwheeler.github.io/slick

diff --git a/slick/slick.min.js b/slick/slick.min.js