tiennm99/caro
1
0
Fork 0
mirror of https://github.com/tiennm99/caro.git synced 2026-09-04 10:16:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

冲突解决

Browse Source
This commit is contained in:
yangweihome
2021-12-03 17:57:59 +08:00
parent 696ff969d6
commit 8fa254580a
1 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
landlords-client/src/main/java/org/nico/ratel/landlords/client/SimpleClient.java
+1 -10
View File
@@ -28,17 +28,8 @@ public class SimpleClient {
public static String protocol = "pb";
private final static String[] serverAddressSource = new String[]{
<<<<<<< HEAD
// "https://raw.githubusercontent.com/ainilili/ratel/master/serverlist.json",
"https://raw.githubusercontent.com/ainilili/ratel/master/serverlist.json",
"https://gitee.com/ainilili/ratel/raw/master/serverlist.json"
=======
"https://raw.githubusercontent.com/ainilili/ratel/master/serverlist.json", //Source
"https://cdn.jsdelivr.net/gh/ainilili/ratel@master/serverlist.json", //CN CDN
"https://raw.fastgit.org/ainilili/ratel/master/serverlist.json", //HongKong CDN
"https://cdn.staticaly.com/gh/ainilili/ratel/master/serverlist.json", //Japanese CDN
"https://ghproxy.com/https://raw.githubusercontent.com/ainilili/ratel/master/serverlist.json", //Korea CDN
"https://gitee.com/ainilili/ratel/raw/master/serverlist.json" //CN Gitee
>>>>>>> bb37c563fd6788bc8763267c2b7936de2a386ae4
};
public static void main(String[] args) throws InterruptedException, IOException, URISyntaxException {