diff --git a/MirrorListV4 b/MirrorListV4 index b784111..4236608 100644 --- a/MirrorListV4 +++ b/MirrorListV4 @@ -30,8 +30,8 @@ 217.79.83.126/32 62.44.96.11/32 87.121.121.4/32 -78.128.80.70/32 78.128.80.69/32 +78.128.80.70/32 207.210.46.249/32 207.210.46.249/32 199.188.220.121/32 @@ -63,9 +63,17 @@ 147.229.176.19/32 89.102.0.150/32 195.113.250.60/32 +<<<<<<< Updated upstream 194.71.11.163/32 194.71.11.165/32 194.71.11.173/32 +======= +194.71.11.165/32 +194.71.11.173/32 +194.71.11.163/32 +194.71.11.163/32 +194.71.11.173/32 +>>>>>>> Stashed changes 194.71.11.165/32 194.71.11.163/32 194.71.11.173/32 @@ -73,10 +81,17 @@ 77.247.64.34/32 194.71.11.173/32 194.71.11.163/32 +<<<<<<< Updated upstream 194.71.11.165/32 194.71.11.165/32 194.71.11.173/32 194.71.11.163/32 +======= +194.71.11.165/32 +194.71.11.173/32 +194.71.11.163/32 +194.71.11.165/32 +>>>>>>> Stashed changes 195.140.195.56/32 193.166.3.3/32 212.27.32.66/32 @@ -120,8 +135,8 @@ 134.76.12.6/32 137.226.34.46/32 129.143.116.10/32 -212.201.68.60/32 212.201.68.61/32 +212.201.68.60/32 134.109.228.1/32 139.174.32.6/32 130.75.2.22/32 @@ -148,7 +163,10 @@ 78.129.164.123/32 85.94.199.210/32 203.178.137.175/32 +<<<<<<< Updated upstream 153.127.75.11/32 +======= +>>>>>>> Stashed changes 85.94.199.210/32 109.73.80.190/32 151.0.128.28/32 @@ -209,6 +227,7 @@ 195.80.174.186/32 213.129.232.18/32 213.129.232.18/32 +<<<<<<< Updated upstream 151.101.130.132/32 151.101.66.132/32 151.101.194.132/32 @@ -217,6 +236,16 @@ 151.101.194.132/32 151.101.130.132/32 151.101.66.132/32 +======= +151.101.66.132/32 +151.101.194.132/32 +151.101.130.132/32 +151.101.2.132/32 +151.101.130.132/32 +151.101.2.132/32 +151.101.66.132/32 +151.101.194.132/32 +>>>>>>> Stashed changes 80.64.47.13/32 193.145.15.20/32 193.146.32.81/32 @@ -227,12 +256,21 @@ 193.146.75.19/32 155.210.4.97/32 82.194.78.250/32 +<<<<<<< Updated upstream 194.71.11.165/32 194.71.11.173/32 194.71.11.163/32 194.71.11.163/32 194.71.11.165/32 194.71.11.173/32 +======= +194.71.11.163/32 +194.71.11.173/32 +194.71.11.165/32 +194.71.11.173/32 +194.71.11.163/32 +194.71.11.165/32 +>>>>>>> Stashed changes 130.235.34.30/32 193.11.30.180/32 194.71.11.163/32 @@ -248,6 +286,7 @@ 129.132.53.171/32 129.132.53.171/32 188.184.105.5/32 +<<<<<<< Updated upstream 188.185.65.208/32 188.184.91.52/32 188.184.90.134/32 @@ -257,6 +296,17 @@ 188.185.8.192/32 188.184.111.122/32 188.185.29.10/32 +======= +188.185.29.10/32 +188.184.23.33/32 +188.184.111.122/32 +188.184.79.248/32 +188.184.104.250/32 +188.184.90.134/32 +188.185.65.208/32 +188.185.8.192/32 +188.184.91.52/32 +>>>>>>> Stashed changes 188.185.25.162/32 83.166.143.42/32 83.166.143.43/32 @@ -283,6 +333,13 @@ 143.20.69.35/32 5.180.211.190/32 208.80.154.139/32 +<<<<<<< Updated upstream +======= +64.50.233.100/32 +64.50.236.52/32 +64.50.233.100/32 +208.80.154.139/32 +>>>>>>> Stashed changes 64.50.236.52/32 64.50.233.100/32 208.80.154.139/32 @@ -292,14 +349,24 @@ 4.153.4.61/32 128.180.2.105/32 128.30.3.141/32 +<<<<<<< Updated upstream 128.226.118.13/32 128.226.118.15/32 +======= +>>>>>>> Stashed changes 128.226.118.12/32 +128.226.118.15/32 128.226.118.14/32 108.61.5.92/32 +<<<<<<< Updated upstream 140.211.166.134/32 64.50.233.100/32 64.50.236.52/32 +======= +64.50.236.52/32 +64.50.233.100/32 +140.211.166.134/32 +>>>>>>> Stashed changes 128.135.10.29/32 77.247.126.176/32 108.86.224.23/32 @@ -351,6 +418,7 @@ 151.101.130.132/32 151.101.66.132/32 151.101.194.132/32 +<<<<<<< Updated upstream 3.164.240.119/32 3.164.240.105/32 3.164.240.73/32 @@ -364,4 +432,20 @@ 185.199.109.153/32 185.199.108.153/32 185.199.111.153/32 +======= +151.101.66.132/32 +3.164.240.105/32 +3.164.240.73/32 +3.164.240.119/32 +3.164.240.123/32 +185.219.221.167/32 +45.84.67.184/32 +185.199.111.153/32 185.199.110.153/32 +185.199.108.153/32 +185.199.109.153/32 +185.199.109.153/32 +>>>>>>> Stashed changes +185.199.110.153/32 +185.199.111.153/32 +185.199.108.153/32 diff --git a/MirrorListV6 b/MirrorListV6 index c629031..7f60211 100644 --- a/MirrorListV6 +++ b/MirrorListV6 @@ -49,20 +49,34 @@ 2001:67c:1220:8b0::93e5:b013/128 2a02:8301:0:2::150/128 2001:718:1007:48::1:60/128 +<<<<<<< Updated upstream 2001:6b0:19::165/128 2001:6b0:19::173/128 2001:6b0:19::163/128 2001:6b0:19::173/128 +======= +2001:6b0:19::173/128 +2001:6b0:19::165/128 +>>>>>>> Stashed changes 2001:6b0:19::163/128 2001:6b0:19::165/128 +2001:6b0:19::173/128 +2001:6b0:19::163/128 2001:878:346::116/128 2a02:4de0:21::2/128 +<<<<<<< Updated upstream 2001:6b0:19::163/128 2001:6b0:19::173/128 2001:6b0:19::165/128 2001:6b0:19::173/128 +======= +2001:6b0:19::173/128 2001:6b0:19::165/128 2001:6b0:19::163/128 +>>>>>>> Stashed changes +2001:6b0:19::165/128 +2001:6b0:19::173/128 +2001:6b0:19::163/128 2001:67c:2b0:19:201:aeff:fe64:6562/128 2001:708:10:8::3/128 2a01:e0c:1:1598::2/128 @@ -123,7 +137,11 @@ 2001:4b78:2000:1::1/128 2001:4b78:2000:1::1/128 2a00:1cc8:0:ff0a::2/128 +<<<<<<< Updated upstream 2001:760:ffff:b6:4:100:0:73/128 +======= +2001:760:ffff:bf::aa/128 +>>>>>>> Stashed changes 2001:4b78:2000:1::1/128 2001:760:2e03::ca:26:0/128 2a05:7cc0::91:211:244:15/128 @@ -170,6 +188,7 @@ 2a02:130:9900:30::12/128 2001:858:2:1::10/128 2001:858:2:1::10/128 +<<<<<<< Updated upstream 2a04:4e42:600::644/128 2a04:4e42:200::644/128 2a04:4e42:400::644/128 @@ -178,21 +197,41 @@ 2a04:4e42:400::644/128 2a04:4e42::644/128 2a04:4e42:600::644/128 +======= +2a04:4e42:400::644/128 +2a04:4e42:600::644/128 +2a04:4e42:200::644/128 +2a04:4e42::644/128 +2a04:4e42:200::644/128 +2a04:4e42::644/128 +2a04:4e42:600::644/128 +2a04:4e42:400::644/128 +>>>>>>> Stashed changes 2001:720:424:1::1:20/128 2001:720:1214:4200::81/128 2a00:9ac0:c1ca:5::134/128 2a12:d282:102:f6::1/128 2001:720:1c14::ffff:c192:4b13/128 +<<<<<<< Updated upstream 2001:6b0:19::165/128 2001:6b0:19::173/128 2001:6b0:19::163/128 +======= +>>>>>>> Stashed changes 2001:6b0:19::165/128 2001:6b0:19::163/128 2001:6b0:19::173/128 +2001:6b0:19::173/128 +2001:6b0:19::163/128 +2001:6b0:19::165/128 2001:6b0:5:50::180/128 +<<<<<<< Updated upstream 2001:6b0:19::165/128 +======= +>>>>>>> Stashed changes 2001:6b0:19::173/128 2001:6b0:19::163/128 +2001:6b0:19::165/128 2a01:8e01:c1ea:6c5c::5/128 2a01:8e01:c1ea:6c5c::8/128 2a02:750:9::e8/128 @@ -201,6 +240,7 @@ 2001:e10:2000:240:e643:4bff:fee8:a63c/128 2001:67c:10ec:3dd1::42/128 2001:67c:10ec:3dd1::42/128 +<<<<<<< Updated upstream 2001:1458:d00:63::100:106/128 2001:1458:d00:34::100:328/128 2001:1458:d00:2c::100:229/128 @@ -212,6 +252,19 @@ 2001:1458:d00:67::100:429/128 2001:1458:201:e4::100:35c/128 2001:1458:d00:2d::100:d4/128 +======= +2001:1458:d00:1::100:408/128 +2001:1458:d00:2c::100:229/128 +2001:1458:d00:34::100:328/128 +2001:1458:201:e4::100:22c/128 +2001:1458:d00:2d::100:1cb/128 +2001:1458:d00:2d::100:d4/128 +2001:1458:d00:67::100:429/128 +2001:1458:d00:63::100:106/128 +2001:1458:d00:6f::100:89/128 +2001:1458:d00:68::100:e4/128 +2001:1458:201:e4::100:35c/128 +>>>>>>> Stashed changes 2001:1600:0:aaaa::2:2/128 2001:1600:0:aaaa::2:1/128 2001:1620::1620/128 @@ -236,12 +289,18 @@ 2600:3402:200:227::2/128 2600:3404:200:237::2/128 2620:0:861:2:208:80:154:139/128 +<<<<<<< Updated upstream +======= +2600:3404:200:237::2/128 +2620:0:861:2:208:80:154:139/128 +2600:3402:200:227::2/128 +>>>>>>> Stashed changes 2a10:4dc0:2:5::2/128 2603:1030:403:3::cee/128 2001:19f0:1595:1403::1092/128 2600:3402:200:227::2/128 -2600:3404:200:237::2/128 2605:bc80:3010::134/128 +2600:3404:200:237::2/128 2a0b:f301:2:7::2/128 2604:2dc0:200:1b57::a/128 2604:fbc0:4::2/128 @@ -277,6 +336,7 @@ 2a04:4e42:400::644/128 2a04:4e42::644/128 2a04:4e42:600::644/128 +<<<<<<< Updated upstream 2600:9000:2764:0:3:db06:4200:93a1/128 2600:9000:2764:4600:3:db06:4200:93a1/128 2600:9000:2764:8a00:3:db06:4200:93a1/128 @@ -295,3 +355,24 @@ 2606:50c0:8003::153/128 2606:50c0:8002::153/128 2606:50c0:8001::153/128 +======= +2a04:4e42::644/128 +2600:9000:2764:ac00:3:db06:4200:93a1/128 +2600:9000:2764:4200:3:db06:4200:93a1/128 +2600:9000:2764:fc00:3:db06:4200:93a1/128 +2600:9000:2764:4a00:3:db06:4200:93a1/128 +2600:9000:2764:8e00:3:db06:4200:93a1/128 +2600:9000:2764:a00:3:db06:4200:93a1/128 +2600:9000:2764:e400:3:db06:4200:93a1/128 +2600:9000:2764:8600:3:db06:4200:93a1/128 +2a01:7e0:0:424::249/128 +2a01:7e0:0:424::249/128 +2606:50c0:8000::153/128 +2606:50c0:8003::153/128 +2606:50c0:8002::153/128 +2606:50c0:8001::153/128 +2606:50c0:8001::153/128 +2606:50c0:8000::153/128 +2606:50c0:8002::153/128 +2606:50c0:8003::153/128 +>>>>>>> Stashed changes diff --git a/OPNS_MirrorListV4 b/OPNS_MirrorListV4 index f382c5e..7c6271d 100644 --- a/OPNS_MirrorListV4 +++ b/OPNS_MirrorListV4 @@ -3,32 +3,52 @@ 178.157.61.30/32 216.24.182.173/32 162.105.120.100/32 +<<<<<<< Updated upstream +======= +104.21.80.1/32 +104.21.48.1/32 +>>>>>>> Stashed changes 104.21.96.1/32 104.21.80.1/32 104.21.64.1/32 104.21.112.1/32 104.21.16.1/32 104.21.32.1/32 +<<<<<<< Updated upstream 104.21.48.1/32 +======= +104.21.64.1/32 +104.21.112.1/32 +>>>>>>> Stashed changes 130.225.254.116/32 46.32.144.253/32 201.159.221.67/32 201.159.221.67/32 193.177.162.187/32 -172.67.206.93/32 104.21.22.179/32 +172.67.206.93/32 141.98.136.67/32 37.208.104.98/32 37.58.58.140/32 147.52.159.50/32 180.151.236.94/32 78.39.136.13/32 +<<<<<<< Updated upstream 104.18.2.39/32 104.18.3.39/32 112.222.241.182/32 104.21.12.56/32 172.67.193.177/32 221.138.103.74/32 +======= +104.18.3.39/32 +104.18.2.39/32 +112.222.241.182/32 +172.67.193.177/32 +104.21.12.56/32 +221.138.103.74/32 +0.0.0.0/32 +>>>>>>> Stashed changes 175.233.142.67/32 196.200.160.70/32 150.242.40.7/32 diff --git a/OPNS_MirrorListV6 b/OPNS_MirrorListV6 index 115a3e2..b0dde3c 100644 --- a/OPNS_MirrorListV6 +++ b/OPNS_MirrorListV6 @@ -1,5 +1,6 @@ 2001:388:30bc:cafe::beef/128 2001:da8:201:1120::a269:7864/128 +<<<<<<< Updated upstream 2606:4700:3030::6815:2001/128 2606:4700:3030::6815:5001/128 2606:4700:3030::6815:7001/128 @@ -7,6 +8,15 @@ 2606:4700:3030::6815:3001/128 2606:4700:3030::6815:1001/128 2606:4700:3030::6815:6001/128 +======= +2606:4700:3030::6815:1001/128 +2606:4700:3030::6815:3001/128 +2606:4700:3030::6815:4001/128 +2606:4700:3030::6815:6001/128 +2606:4700:3030::6815:2001/128 +2606:4700:3030::6815:7001/128 +2606:4700:3030::6815:5001/128 +>>>>>>> Stashed changes 2001:878:346::116/128 2001:470:dd11:1337:d0cd:bfff:feaa:fb37/128 2800:68:0:bebe::3/128 @@ -20,9 +30,13 @@ 2606:4700::6812:227/128 2606:4700:3036::6815:c38/128 2606:4700:3034::ac43:c1b1/128 +<<<<<<< Updated upstream +======= +::/128 +>>>>>>> Stashed changes 2001:4310:f1::70/128 -2602:faa5:190::/128 2602:faa5:189::/128 +2602:faa5:190::/128 2a12:d282:102:f6::1/128 2a00:d08:1:c::153/128 2001:1620::1620/128