From 2479b946b95e57bdd959c9d43b97921fc84be37b Mon Sep 17 00:00:00 2001
From: hailin <1356886193@qq.com>
Date: 星期二, 01 八月 2023 09:11:41 +0800
Subject: [PATCH] 标准库jack的第一次提交
---
README.md | 42 ------------------------------------------
1 files changed, 0 insertions(+), 42 deletions(-)
diff --git a/README.md b/README.md
index fad88b5..60ad219 100644
--- a/README.md
+++ b/README.md
@@ -1,44 +1,3 @@
-<<<<<<< HEAD
-# 鍓嶇涓ぉ娴锋磱
-
-#### 浠嬬粛
-{**浠ヤ笅鏄� Gitee 骞冲彴璇存槑锛屾偍鍙互鏇挎崲姝ょ畝浠�**
-Gitee 鏄� OSCHINA 鎺ㄥ嚭鐨勫熀浜� Git 鐨勪唬鐮佹墭绠″钩鍙帮紙鍚屾椂鏀寔 SVN锛夈�備笓涓哄紑鍙戣�呮彁渚涚ǔ瀹氥�侀珮鏁堛�佸畨鍏ㄧ殑浜戠杞欢寮�鍙戝崗浣滃钩鍙�
-鏃犺鏄釜浜恒�佸洟闃熴�佹垨鏄紒涓氾紝閮借兘澶熺敤 Gitee 瀹炵幇浠ｇ爜鎵樼銆侀」鐩鐞嗐�佸崗浣滃紑鍙戙�備紒涓氶」鐩鐪� [https://gitee.com/enterprises](https://gitee.com/enterprises)}
-
-#### 杞欢鏋舵瀯
-杞欢鏋舵瀯璇存槑
-
-
-#### 瀹夎鏁欑▼
-
-1. xxxx
-2. xxxx
-3. xxxx
-
-#### 浣跨敤璇存槑
-
-1. xxxx
-2. xxxx
-3. xxxx
-
-#### 鍙備笌璐＄尞
-
-1. Fork 鏈粨搴�
-2. 鏂板缓 Feat_xxx 鍒嗘敮
-3. 鎻愪氦浠ｇ爜
-4. 鏂板缓 Pull Request
-
-
-#### 鐗规妧
-
-1. 浣跨敤 Readme\_XXX.md 鏉ユ敮鎸佷笉鍚岀殑璇█锛屼緥濡� Readme\_en.md, Readme\_zh.md
-2. Gitee 瀹樻柟鍗氬 [blog.gitee.com](https://blog.gitee.com)
-3. 浣犲彲浠� [https://gitee.com/explore](https://gitee.com/explore) 杩欎釜鍦板潃鏉ヤ簡瑙� Gitee 涓婄殑浼樼寮�婧愰」鐩�
-4. [GVP](https://gitee.com/gvp) 鍏ㄧО鏄� Gitee 鏈�鏈変环鍊煎紑婧愰」鐩紝鏄患鍚堣瘎瀹氬嚭鐨勪紭绉�寮�婧愰」鐩�
-5. Gitee 瀹樻柟鎻愪緵鐨勪娇鐢ㄦ墜鍐� [https://gitee.com/help](https://gitee.com/help)
-6. Gitee 灏侀潰浜虹墿鏄竴妗ｇ敤鏉ュ睍绀� Gitee 浼氬憳椋庨噰鐨勬爮鐩� [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)
-=======
# vue_model
> A Vue.js project
@@ -60,4 +19,3 @@
```
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).
->>>>>>> c1c41a4 (棣栨鎻愪氦)
--
Gitblit v1.9.3