首次提交，模仿https://kar.kardz.cc/编写

README.md

@@ -1,11 +1,4 @@
 <<<<<<< HEAD
-# 外包商城
-## 安装框架
-1. 更新npm `npm install -g npm@10.2.2`
-2. 创建vite项目 `npm create vite@latest`
-3. 安装路由 `npm install vue-router@4`
-4. 安装sass `npm install -D sass`
-=======
 # Vue3 Kkc
 
 
@@ -99,4 +92,11 @@ For open source projects, say how it is licensed.
 
 ## Project status
 If you have run out of energy or time for your project, put a note at the top of the README saying that development has slowed down or stopped completely. Someone may choose to fork your project or volunteer to step in as a maintainer or owner, allowing your project to keep going. You can also make an explicit request for maintainers.
->>>>>>> 45379b4 (Initial commit)
+=======
+# 外包商城
+## 安装框架
+1. 更新npm `npm install -g npm@10.2.2`
+2. 创建vite项目 `npm create vite@latest`
+3. 安装路由 `npm install vue-router@4`
+4. 安装sass `npm install -D sass`
+>>>>>>> 705ba6b (首次提交，模仿https://kar.kardz.cc/编写)