resolved conflicts

2020-03-24 20:15:13 +05:30 · 2020-03-24 20:15:13 +05:30 · 38b65dd78f
parent 139bd36443 141090570f
commit 38b65dd78f
2 changed files with 2 additions and 2 deletions
--- a/packages/Webkul/Velocity/package.json
+++ b/packages/Webkul/Velocity/package.json
@ -23,7 +23,7 @@
    "bootstrap-sass": "^3.4.1",
    "font-awesome": "^4.7.0",
    "material-icons": "^0.3.1",
-    "vee-validate": "2.0.0-rc.26",
+    "vee-validate": "^2.2.15",
    "vue-slider-component": "^3.1.0",
    "vue-toast-notification": "0.0.2"
  }
--- a/packages/Webkul/Velocity/publishable/assets/js/velocity.js
+++ b/packages/Webkul/Velocity/publishable/assets/js/velocity.js