diff --git a/README.md b/README.md index 93e0852f7..7b2cf7d69 100755 --- a/README.md +++ b/README.md @@ -1340,15 +1340,8 @@ Winlin [branch2]: https://github.com/ossrs/srs/tree/2.0release [release2]: https://github.com/ossrs/srs/wiki/v1_CN_Product#release20 [release3]: https://github.com/ossrs/srs/wiki/v1_CN_Product#release30 -<<<<<<< HEAD -[centos0]: http://winlinvip.github.io/srs.release/releases/files/SRS-CentOS6-x86_64-2.0.205.zip -[centos1]: http://www.ossrs.net/srs.release/releases/files/SRS-CentOS6-x86_64-2.0.205.zip -[srs_CN]: https://github.com/ossrs/srs/wiki/v3_CN_Home -[srs_EN]: https://github.com/ossrs/srs/wiki/v3_EN_Home -======= [centos0]: http://winlinvip.github.io/srs.release/releases/files/SRS-CentOS6-x86_64-2.0.210.zip [centos1]: http://www.ossrs.net/srs.release/releases/files/SRS-CentOS6-x86_64-2.0.210.zip -[srs_CN]: https://github.com/ossrs/srs/wiki/v2_CN_Home -[srs_EN]: https://github.com/ossrs/srs/wiki/v2_EN_Home ->>>>>>> 2.0release +[srs_CN]: https://github.com/ossrs/srs/wiki/v3_CN_Home +[srs_EN]: https://github.com/ossrs/srs/wiki/v3_EN_Home