Skip to content

liangzhen / framework-tools-web

Go to a project
Commit 12be6a75 by songchangcheng
Options

解决package-lock.json冲突

1 parent 2518de7e
Inline Side-by-side
Showing with 0 additions and 3 deletions
package-lock.json
...@@ -13613,8 +13613,6 @@ ...@@ -13613,8 +13613,6 @@
} }
} }
}, },
<<<<<<< HEAD
=======
"@vue/vue-loader-v15": { "@vue/vue-loader-v15": {
"version": "npm:vue-loader@15.11.1", "version": "npm:vue-loader@15.11.1",
"resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-15.11.1.tgz", "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-15.11.1.tgz",
...@@ -13636,7 +13634,6 @@ ...@@ -13636,7 +13634,6 @@
} }
} }
}, },
>>>>>>> 95ade57cb437050dbbaeafd9b139c75ff59857d7
"@vue/web-component-wrapper": { "@vue/web-component-wrapper": {
"version": "1.3.0", "version": "1.3.0",
"resolved": "https://registry.npmmirror.com/@vue/web-component-wrapper/-/web-component-wrapper-1.3.0.tgz", "resolved": "https://registry.npmmirror.com/@vue/web-component-wrapper/-/web-component-wrapper-1.3.0.tgz",
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!