胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
7933b6ab 1 parent ce6f4bfb

update readme

内嵌 并排对比
正在显示 1 个修改的文件 包含 2 行增加 和 9 行删除
@@ -1340,15 +1340,8 @@ Winlin @@ -1340,15 +1340,8 @@ Winlin
1340 [branch2]: https://github.com/ossrs/srs/tree/2.0release 1340 [branch2]: https://github.com/ossrs/srs/tree/2.0release
1341 [release2]: https://github.com/ossrs/srs/wiki/v1_CN_Product#release20 1341 [release2]: https://github.com/ossrs/srs/wiki/v1_CN_Product#release20
1342 [release3]: https://github.com/ossrs/srs/wiki/v1_CN_Product#release30 1342 [release3]: https://github.com/ossrs/srs/wiki/v1_CN_Product#release30
1343 -<<<<<<< HEAD  
1344 -[centos0]: http://winlinvip.github.io/srs.release/releases/files/SRS-CentOS6-x86_64-2.0.205.zip  
1345 -[centos1]: http://www.ossrs.net/srs.release/releases/files/SRS-CentOS6-x86_64-2.0.205.zip  
1346 -[srs_CN]: https://github.com/ossrs/srs/wiki/v3_CN_Home  
1347 -[srs_EN]: https://github.com/ossrs/srs/wiki/v3_EN_Home  
1348 -=======  
1349 [centos0]: http://winlinvip.github.io/srs.release/releases/files/SRS-CentOS6-x86_64-2.0.210.zip 1343 [centos0]: http://winlinvip.github.io/srs.release/releases/files/SRS-CentOS6-x86_64-2.0.210.zip
1350 [centos1]: http://www.ossrs.net/srs.release/releases/files/SRS-CentOS6-x86_64-2.0.210.zip 1344 [centos1]: http://www.ossrs.net/srs.release/releases/files/SRS-CentOS6-x86_64-2.0.210.zip
1351 -[srs_CN]: https://github.com/ossrs/srs/wiki/v2_CN_Home  
1352 -[srs_EN]: https://github.com/ossrs/srs/wiki/v2_EN_Home  
1353 ->>>>>>> 2.0release 1345 +[srs_CN]: https://github.com/ossrs/srs/wiki/v3_CN_Home
  1346 +[srs_EN]: https://github.com/ossrs/srs/wiki/v3_EN_Home
1354 1347