From 9860e221460a0a4ac1903dad2c97160d0eed0e63 Mon Sep 17 00:00:00 2001
From: long <515897141@qq.com>
Date: 星期五, 03 三月 2023 10:59:42 +0800
Subject: [PATCH] 初始化

---
 README.md |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/README.md b/README.md
index 3df2066..565bda8 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # empty_wx_h5_vue_hx
 
 > 鐏唺寰俊鍏紬鍙稨5vue璧峰婧愮爜
@@ -27,4 +28,10 @@
 npm test
 ```
 
-For a detailed explanation on how things work, check out the [guide](http://vuejs-templates.github.io/webpack/) and [docs for vue-loader](http://vuejs.github.io/vue-loader).
\ No newline at end of file
+For a detailed explanation on how things work, check out the [guide](http://vuejs-templates.github.io/webpack/) and [docs for vue-loader](http://vuejs.github.io/vue-loader).
+=======
+## ChatGPT_h5
+
+ChatGPT鐨刪5椤甸潰椤圭洰
+
+>>>>>>> 53e55b6ced38846062d6334df5111c8876cf2845

--
Gitblit v1.8.0