bakaEC/OliveSensorAPI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

solve conflict in readme files

Browse Source
This commit is contained in:
HongCheng 2024-03-03 19:56:51 +09:00
parent 2fb3e26ffe
commit a84732794b
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -203,10 +203,10 @@ git clone https://github.com/SmartFlowAI/EmoLLM.git
[aiyinyuedejustin](https://github.com/aiyinyuedejustin)@宾夕法尼亚大学在读硕士 [aiyinyuedejustin](https://github.com/aiyinyuedejustin)@宾夕法尼亚大学在读硕士
[chg0901](https://github.com/chg0901)@韩国光云大学博士生
[Nobody-ML](https://github.com/Nobody-ML)@中国石油大学（华东）在读本科生 [Nobody-ML](https://github.com/Nobody-ML)@中国石油大学（华东）在读本科生
[chg0901](https://github.com/chg0901)@韩国光云大学博士生
### 版权说明 ### 版权说明
该项目签署了MIT 授权许可，详情请参阅 [LICENSE](https://github.com/aJupyter/EmoLLM/blob/master/LICENSE) 该项目签署了MIT 授权许可，详情请参阅 [LICENSE](https://github.com/aJupyter/EmoLLM/blob/master/LICENSE)

4
README_EN.md
View File

@ -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 [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 ### Copyright Notice
The project is licensed under the MIT License. Please refer to the details The project is licensed under the MIT License. Please refer to the details

2
xtuner_config/images/README.md
View File

@ -1 +1 @@
此文件夹存放所有相关文件图片 此文件夹存放所有相关文件图片