merge

b59a98c2 · ddl · 69ccb76b · b59a98c2
Commit b59a98c2 authored Apr 26, 2023 by ddl
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 5 deletions

package-lock.json package-lock.json +0 -5

No files found.
--- a/package-lock.json
+++ b/package-lock.json
 {
-<<<<<<< HEAD
-  "requires": true,
-  "lockfileVersion": 1,
-=======
  "name": "qk_wx_miniprogram",
  "version": "1.0.0",
  "lockfileVersion": 1,
  "requires": true,
->>>>>>> feature/ddl
  "dependencies": {
    "@vant/weapp": {
      "version": "1.10.14",