fix confilict

This commit is contained in:
Looly 2025-02-21 09:12:25 +08:00
commit 381bc9c229
2 changed files with 45 additions and 45 deletions

View File

@ -49,7 +49,7 @@
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
=======
[**🌎中文说明**](README.md) [**🌎中文说明**](README.md)

View File

@ -116,7 +116,7 @@ Hutool目前主要版本4.x、5.x、6.x选择如下
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
=======
## 📦安装 ## 📦安装
@ -154,7 +154,7 @@ implementation 'org.dromara.hutool:hutool-all:6.0.0-M21'
下载整个项目源码v6-master或v6-dev分支都可然后进入Hutool项目目录执行 下载整个项目源码v6-master或v6-dev分支都可然后进入Hutool项目目录执行
```sh ```sh
./hutool.sh install ./hutool.sh install 。/ hutool.sh安装
``` ```
然后就可以使用Maven引入了。 然后就可以使用Maven引入了。
@ -178,7 +178,7 @@ Hutool的源码分为两个分支功能如下
- [Gitee issue](https://gitee.com/dromara/hutool/issues) - [Gitee issue](https://gitee.com/dromara/hutool/issues)
- [Github issue](https://github.com/dromara/hutool/issues) - [Github issue](https://github.com/dromara/hutool/issues)
- [Gitcode issue](https://gitcode.com/dromara/hutool/issues) - [Gitcode issue Gitcode问题](https://gitcode.com/dromara/hutool/issues)
### 🧬贡献代码的步骤 ### 🧬贡献代码的步骤
@ -208,7 +208,7 @@ Hutool欢迎任何人为Hutool添砖加瓦贡献代码不过维护者是
## ⭐Star Hutool ## ⭐Star Hutool
[![Stargazers over time](https://starchart.cc/dromara/hutool.svg)](https://starchart.cc/dromara/hutool) [![Stargazers over time](https://starchart.cc/dromara/hutool.svg)](https://starchart.cc/dromara/hutool)[![随时间变化的观星者](https://starchart.cc/dromara/hutool.svg)]https://starchart.cc/dromara/hutool
### GitHub Contributor Over Time ### GitHub Contributor Over Time
[![Contributor Over Time](https://contributor-overtime-api.git-contributor.com/contributors-svg?chart=contributorOverTime&repo=dromara/hutool)](https://git-contributor.com?chart=contributorOverTime&repo=dromara/hutool) [![Contributor Over Time](https://contributor-overtime-api.git-contributor.com/contributors-svg?chart=contributorOverTime&repo=dromara/hutool)](https://git-contributor.com?chart=contributorOverTime&repo=dromara/hutool)