chore: resolve conflicts

pulsardev · Mar 28, 2021 · aac5c34 · aac5c34
1 parent dca8f20
commit aac5c34
Show file tree

Hide file tree

Showing 9 changed files with 1,061 additions and 1,241 deletions.
diff --git a/dist/vue-tour.common.js b/dist/vue-tour.common.js
diff --git a/dist/vue-tour.common.js.map b/dist/vue-tour.common.js.map
diff --git a/dist/vue-tour.css b/dist/vue-tour.css
diff --git a/dist/vue-tour.umd.js b/dist/vue-tour.umd.js
diff --git a/dist/vue-tour.umd.js.map b/dist/vue-tour.umd.js.map
diff --git a/dist/vue-tour.umd.min.js b/dist/vue-tour.umd.min.js
diff --git a/dist/vue-tour.umd.min.js.map b/dist/vue-tour.umd.min.js.map
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/components/VStep.vue b/src/components/VStep.vue
@@ -116,8 +116,7 @@ export default {
           this.enableScrolling()
           this.createHighlight()
 
-          /* eslint-disable no-new */
-          new Popper(
+          createPopper(
             this.targetElement,
             this.$refs['v-step-' + this.hash],
             this.params