From a84732794baaf3e8518fa3deb46ffa087ef0e5c7 Mon Sep 17 00:00:00 2001 From: HongCheng Date: Sun, 3 Mar 2024 19:56:51 +0900 Subject: [PATCH] solve conflict in readme files --- README.md | 4 ++-- README_EN.md | 4 ++++ xtuner_config/images/README.md | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 4751077..5d32eb0 100644 --- a/README.md +++ b/README.md @@ -203,10 +203,10 @@ git clone https://github.com/SmartFlowAI/EmoLLM.git [aiyinyuedejustin](https://github.com/aiyinyuedejustin)@宾夕法尼亚大学在读硕士 -[chg0901](https://github.com/chg0901)@韩国光云大学博士生 - [Nobody-ML](https://github.com/Nobody-ML)@中国石油大学（华东）在读本科生 +[chg0901](https://github.com/chg0901)@韩国光云大学博士生 + ### 版权说明 该项目签署了MIT 授权许可，详情请参阅 [LICENSE](https://github.com/aJupyter/EmoLLM/blob/master/LICENSE) diff --git a/README_EN.md b/README_EN.md index 9dc2651..4bdd56d 100644 --- a/README_EN.md +++ b/README_EN.md @@ -206,6 +206,10 @@ This project uses Git for version control. You can see the current available ver [aiyinyuedejustin](https://github.com/aiyinyuedejustin)@Master's student at University of Pennsylvania +[Nobody-ML](https://github.com/Nobody-ML)@中国石油大学（华东）在读本科生 + +[chg0901](https://github.com/chg0901)@韩国光云大学博士生 + ### Copyright Notice The project is licensed under the MIT License. Please refer to the details diff --git a/xtuner_config/images/README.md b/xtuner_config/images/README.md index 0dc791f..abfefff 100644 --- a/xtuner_config/images/README.md +++ b/xtuner_config/images/README.md @@ -1 +1 @@ -此文件夹存放所有相关文件图片 +此文件夹存放所有相关文件图片 \ No newline at end of file