From 4f912f23e61912cb3195ca168f23bb521bf8b309 Mon Sep 17 00:00:00 2001
From: Mr.Shi <1878285526@qq.com>
Date: 星期四, 21 九月 2023 13:37:16 +0800
Subject: [PATCH] 企业端
---
h5/package-lock.json | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/h5/package-lock.json b/h5/package-lock.json
index f54d67b..839857b 100644
--- a/h5/package-lock.json
+++ b/h5/package-lock.json
@@ -1,4 +1,5 @@
{
+<<<<<<< HEAD
"requires": true,
"lockfileVersion": 1,
"dependencies": {
@@ -22,4 +23,10 @@
"integrity": "sha512-TlhdSp2oEOLFXvEp4psKaeTjR5zBjTRcM/sHUN8PkV1UWuY8HKC8n7GaVdW5Xqnwdr/F1OmzLik1QwDjI4w/nw=="
}
}
+=======
+ "name": "h5",
+ "lockfileVersion": 3,
+ "requires": true,
+ "packages": {}
+>>>>>>> 1ee5043af9ee5e53acb52a70fd93c4656e8bbb44
}
--
Gitblit v1.9.3