From 19f5f603fb890e84e43fadcf3135e660802026d0 Mon Sep 17 00:00:00 2001
From: wangrong <wangrong@shsening.com>
Date: 星期二, 28 六月 2022 14:51:13 +0800
Subject: [PATCH] 解决冲突

---
 package.json |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/package.json b/package.json
index e36a2df..2324d42 100644
--- a/package.json
+++ b/package.json
@@ -84,4 +84,4 @@
   },
   "author": "cool-js.com",
   "license": "MIT"
-}
+}
\ No newline at end of file

--
Gitblit v1.9.1