merging

kenwheeler · Feb 25, 2016 · 46e6a52 · 46e6a52
1 parent 39e1c28
commit 46e6a52
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/slick/slick.js b/slick/slick.js
@@ -52,11 +52,7 @@
                 centerPadding: '50px',
                 cssEase: 'ease',
                 customPaging: function(slider, i) {
-<<<<<<< HEAD
                     return $('<button type="button" data-role="none"/>').text(i + 1);
-=======
-                    return $('<button type="button" data-role="none" role="button" tabindex="0" />').text(i + 1);
->>>>>>> upstream/master
                 },
                 dots: false,
                 dotsClass: 'slick-dots',