chore: build dist

glidejs · Nov 21, 2021 · 7dedba2 · 7dedba2
1 parent 5e958de
commit 7dedba2
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 0 deletions.
diff --git a/dist/glide.esm.js b/dist/glide.esm.js
@@ -734,6 +734,7 @@ var Glide$1 = /*#__PURE__*/function () {
 
       return this;
     }
+<<<<<<< HEAD
     /**
      * Change slide with specified pattern. A pattern must be in the special format:
      * `>` - Move one forward
@@ -744,6 +745,20 @@ var Glide$1 = /*#__PURE__*/function () {
      *
      * @param {String} pattern
      * @return {Glide}
+=======
+    /**
+     * Change slide with specified pattern. A pattern must be in the special format:
+     * `>` - Move one forward
+     * `<` - Move one backward
+     * `={i}` - Go to {i} zero-based slide (eq. '=1', will go to second slide)
+     * `>>` - Rewinds to end (last slide)
+     * `<<` - Rewinds to start (first slide)
+     * `|>` - Move one viewport forward
+     * `|<` - Move one viewport backward
+     *
+     * @param {String} pattern
+     * @return {Glide}
+>>>>>>> 4697d13 (chore: build dist)
      */
 
   }, {

diff --git a/dist/glide.js b/dist/glide.js
@@ -740,6 +740,7 @@
 
         return this;
       }
+<<<<<<< HEAD
       /**
        * Change slide with specified pattern. A pattern must be in the special format:
        * `>` - Move one forward
@@ -750,6 +751,20 @@
        *
        * @param {String} pattern
        * @return {Glide}
+=======
+      /**
+       * Change slide with specified pattern. A pattern must be in the special format:
+       * `>` - Move one forward
+       * `<` - Move one backward
+       * `={i}` - Go to {i} zero-based slide (eq. '=1', will go to second slide)
+       * `>>` - Rewinds to end (last slide)
+       * `<<` - Rewinds to start (first slide)
+       * `|>` - Move one viewport forward
+       * `|<` - Move one viewport backward
+       *
+       * @param {String} pattern
+       * @return {Glide}
+>>>>>>> 4697d13 (chore: build dist)
        */
 
     }, {

diff --git a/dist/glide.modular.esm.js b/dist/glide.modular.esm.js
@@ -734,6 +734,7 @@ var Glide$1 = /*#__PURE__*/function () {
 
       return this;
     }
+<<<<<<< HEAD
     /**
      * Change slide with specified pattern. A pattern must be in the special format:
      * `>` - Move one forward
@@ -744,6 +745,20 @@ var Glide$1 = /*#__PURE__*/function () {
      *
      * @param {String} pattern
      * @return {Glide}
+=======
+    /**
+     * Change slide with specified pattern. A pattern must be in the special format:
+     * `>` - Move one forward
+     * `<` - Move one backward
+     * `={i}` - Go to {i} zero-based slide (eq. '=1', will go to second slide)
+     * `>>` - Rewinds to end (last slide)
+     * `<<` - Rewinds to start (first slide)
+     * `|>` - Move one viewport forward
+     * `|<` - Move one viewport backward
+     *
+     * @param {String} pattern
+     * @return {Glide}
+>>>>>>> 4697d13 (chore: build dist)
      */
 
   }, {