diff --git a/MirrorListV4 b/MirrorListV4 index ab237f4..5342f01 100644 --- a/MirrorListV4 +++ b/MirrorListV4 @@ -65,6 +65,7 @@ 195.113.250.60/32 217.31.202.63/32 <<<<<<< Updated upstream +<<<<<<< Updated upstream 194.71.11.173/32 194.71.11.165/32 194.71.11.163/32 @@ -72,6 +73,12 @@ ======= 194.71.11.165/32 194.71.11.173/32 +======= +194.71.11.173/32 +194.71.11.165/32 +194.71.11.163/32 +194.71.11.173/32 +>>>>>>> Stashed changes 194.71.11.163/32 >>>>>>> Stashed changes 194.71.11.173/32 @@ -79,11 +86,17 @@ 194.71.11.163/32 130.225.254.116/32 77.247.64.34/32 -194.71.11.165/32 194.71.11.163/32 194.71.11.173/32 194.71.11.165/32 +194.71.11.165/32 +194.71.11.163/32 194.71.11.173/32 +<<<<<<< Updated upstream +194.71.11.165/32 +194.71.11.173/32 +======= +>>>>>>> Stashed changes 194.71.11.163/32 195.140.195.56/32 193.166.3.3/32 @@ -128,8 +141,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 132.180.8.60/32 @@ -162,7 +175,11 @@ 85.94.199.210/32 109.73.80.190/32 151.0.128.28/32 +<<<<<<< Updated upstream 90.147.160.73/32 +======= +193.206.214.14/32 +>>>>>>> Stashed changes 85.94.199.210/32 130.251.19.2/32 140.105.48.55/32 @@ -232,6 +249,7 @@ 155.210.4.97/32 82.194.78.250/32 <<<<<<< Updated upstream +<<<<<<< Updated upstream 194.71.11.173/32 194.71.11.165/32 194.71.11.163/32 @@ -251,6 +269,19 @@ 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 +194.71.11.165/32 +194.71.11.163/32 +194.71.11.165/32 +194.71.11.173/32 +130.235.34.30/32 +193.11.30.180/32 +194.71.11.163/32 +194.71.11.173/32 +194.71.11.165/32 +>>>>>>> Stashed changes 194.132.225.213/32 94.103.202.216/32 109.74.12.226/32 @@ -259,6 +290,7 @@ 129.132.53.171/32 129.132.53.171/32 <<<<<<< Updated upstream +<<<<<<< Updated upstream 188.184.91.52/32 188.184.23.33/32 188.185.8.192/32 @@ -283,6 +315,19 @@ 188.185.8.192/32 188.185.65.208/32 >>>>>>> Stashed changes +======= +188.184.111.122/32 +188.184.91.52/32 +188.185.65.208/32 +188.184.79.248/32 +188.185.25.162/32 +188.184.104.250/32 +188.184.90.134/32 +188.184.105.5/32 +188.184.23.33/32 +188.185.29.10/32 +188.185.8.192/32 +>>>>>>> Stashed changes 83.166.143.42/32 83.166.143.43/32 109.202.202.202/32 @@ -307,11 +352,15 @@ 212.219.56.184/32 143.20.69.35/32 5.180.211.190/32 +<<<<<<< Updated upstream 64.50.236.52/32 208.80.154.139/32 64.50.233.100/32 64.50.233.100/32 +======= +>>>>>>> Stashed changes 64.50.236.52/32 +64.50.233.100/32 208.80.154.139/32 <<<<<<< Updated upstream 208.80.154.139/32 @@ -320,24 +369,35 @@ ======= >>>>>>> Stashed changes 92.119.16.152/32 -4.153.4.61/32 +172.179.119.208/32 128.180.2.105/32 128.30.3.141/32 <<<<<<< Updated upstream +<<<<<<< Updated upstream 128.226.118.14/32 128.226.118.12/32 128.226.118.13/32 128.226.118.15/32 ======= 128.226.118.15/32 +======= +>>>>>>> Stashed changes 128.226.118.12/32 128.226.118.13/32 +<<<<<<< Updated upstream 128.226.118.14/32 >>>>>>> Stashed changes 108.61.5.92/32 64.50.233.100/32 140.211.166.134/32 64.50.236.52/32 +======= +128.226.118.15/32 +108.61.5.92/32 +64.50.236.52/32 +140.211.166.134/32 +64.50.233.100/32 +>>>>>>> Stashed changes 128.135.10.29/32 77.247.126.176/32 108.86.224.23/32 @@ -389,6 +449,7 @@ 151.101.130.132/32 151.101.194.132/32 <<<<<<< Updated upstream +<<<<<<< Updated upstream 151.101.2.132/32 3.174.113.51/32 3.174.113.38/32 @@ -419,3 +480,20 @@ 185.199.108.153/32 >>>>>>> Stashed changes 185.199.110.153/32 +======= +151.101.2.132/32 +3.164.240.105/32 +3.164.240.119/32 +3.164.240.123/32 +3.164.240.73/32 +51.91.38.34/32 +45.84.67.184/32 +185.199.109.153/32 +185.199.110.153/32 +185.199.108.153/32 +185.199.111.153/32 +185.199.111.153/32 +185.199.110.153/32 +185.199.108.153/32 +185.199.109.153/32 +>>>>>>> Stashed changes diff --git a/MirrorListV6 b/MirrorListV6 index 59730a6..df5d8b7 100644 --- a/MirrorListV6 +++ b/MirrorListV6 @@ -52,13 +52,20 @@ 2001:1488:ffff::63/128 2001:6b0:19::163/128 <<<<<<< Updated upstream +<<<<<<< Updated upstream 2001:6b0:19::173/128 2001:6b0:19::165/128 +======= +2001:6b0:19::173/128 +2001:6b0:19::165/128 +2001:6b0:19::163/128 +>>>>>>> Stashed changes 2001:6b0:19::173/128 2001:6b0:19::163/128 2001:6b0:19::165/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 @@ -78,6 +85,14 @@ >>>>>>> Stashed changes 2001:6b0:19::173/128 2001:6b0:19::163/128 +======= +2001:6b0:19::173/128 +2001:6b0:19::163/128 +2001:6b0:19::165/128 +2001:6b0:19::163/128 +2001:6b0:19::173/128 +2001:6b0:19::165/128 +>>>>>>> Stashed changes 2001:67c:2b0:19:201:aeff:fe64:6562/128 2001:708:10:8::3/128 2a01:e0c:1:1598::2/128 @@ -196,6 +211,7 @@ <<<<<<< Updated upstream ======= 2001:6b0:19::165/128 +<<<<<<< Updated upstream 2001:6b0:19::173/128 2001:6b0:19::163/128 2001:6b0:19::163/128 @@ -207,21 +223,34 @@ 2001:6b0:19::163/128 2001:6b0:19::173/128 2001:6b0:19::165/128 +======= +2001:6b0:19::163/128 +2001:6b0:19::173/128 +2001:6b0:19::165/128 +2001:6b0:5:50::180/128 +2001:6b0:19::165/128 +2001:6b0:19::173/128 +2001:6b0:19::163/128 +>>>>>>> Stashed changes 2a01:8e01:c1ea:6c5c::5/128 2a01:8e01:c1ea:6c5c::8/128 2a02:750:9::e8/128 2001:67c:10ec:3dd1::42/128 -2001:e10:2000:240:e643:4bff:fee8:a63c/128 2001:67c:10ec:3dd1::42/128 2001:67c:10ec:3dd1::42/128 <<<<<<< Updated upstream +<<<<<<< Updated upstream 2001:1458:d00:34::100:328/128 2001:1458:201:e4::100:22c/128 2001:1458:d00:63::100:106/128 +======= +2001:1458:d00:6f::100:89/128 +>>>>>>> Stashed changes 2001:1458:d00:1::100:408/128 2001:1458:d00:6f::100:89/128 2001:1458:d00:68::100:e4/128 2001:1458:d00:2c::100:229/128 +<<<<<<< Updated upstream 2001:1458:d00:2d::100:1cb/128 ======= >>>>>>> Stashed changes @@ -239,6 +268,16 @@ 2001:1458:d00:63::100:106/128 2001:1458:d00:2d::100:1cb/128 >>>>>>> Stashed changes +======= +2001:1458:d00:67::100:429/128 +2001:1458:d00:34::100:328/128 +2001:1458:d00:2d::100:1cb/128 +2001:1458:201:e4::100:35c/128 +2001:1458:201:e4::100:22c/128 +2001:1458:d00:2d::100:d4/128 +2001:1458:d00:68::100:e4/128 +2001:1458:d00:63::100:106/128 +>>>>>>> Stashed changes 2001:1600:0:aaaa::2:2/128 2001:1600:0:aaaa::2:1/128 2001:1620::1620/128 @@ -258,9 +297,16 @@ 2a0f:85c1:c3b:2010::35/128 2a0d:5082:0:7::2/128 <<<<<<< Updated upstream +<<<<<<< Updated upstream +======= +2620:0:861:2:208:80:154:139/128 +2600:3404:200:237::2/128 +2600:3402:200:227::2/128 +>>>>>>> Stashed changes 2600:3402:200:227::2/128 2620:0:861:2:208:80:154:139/128 2600:3404:200:237::2/128 +<<<<<<< Updated upstream 2600:3402:200:227::2/128 ======= 2620:0:861:2:208:80:154:139/128 @@ -270,10 +316,14 @@ >>>>>>> Stashed changes 2620:0:861:2:208:80:154:139/128 2600:3404:200:237::2/128 +======= +2620:0:861:2:208:80:154:139/128 +>>>>>>> Stashed changes 2a10:4dc0:2:5::2/128 2603:1030:c02:9::507/128 2001:19f0:1595:1403::1092/128 <<<<<<< Updated upstream +<<<<<<< Updated upstream 2600:3404:200:237::2/128 2605:bc80:3010::134/128 2600:3402:200:227::2/128 @@ -282,6 +332,11 @@ 2600:3402:200:227::2/128 2600:3404:200:237::2/128 >>>>>>> Stashed changes +======= +2600:3402:200:227::2/128 +2605:bc80:3010::134/128 +2600:3404:200:237::2/128 +>>>>>>> Stashed changes 2a0b:f301:2:7::2/128 2604:2dc0:200:1b57::a/128 2604:fbc0:4::2/128 @@ -312,10 +367,16 @@ 2001:67c:744:7::2/128 2a06:1700:0:38::1/128 2001:1328:54:fff::2/128 +<<<<<<< Updated upstream +======= +2a04:4e42::644/128 +2a04:4e42:600::644/128 +>>>>>>> Stashed changes 2a04:4e42:200::644/128 <<<<<<< Updated upstream 2a04:4e42::644/128 2a04:4e42:400::644/128 +<<<<<<< Updated upstream 2a04:4e42:600::644/128 2600:9000:2764:9600:3:db06:4200:93a1/128 2600:9000:2764:b000:3:db06:4200:93a1/128 @@ -357,3 +418,23 @@ 2606:50c0:8000::153/128 2606:50c0:8003::153/128 >>>>>>> Stashed changes +======= +2600:9000:2764:6200:3:db06:4200:93a1/128 +2600:9000:2764:ae00:3:db06:4200:93a1/128 +2600:9000:2764:dc00:3:db06:4200:93a1/128 +2600:9000:2764:3400:3:db06:4200:93a1/128 +2600:9000:2764:d200:3:db06:4200:93a1/128 +2600:9000:2764:7200:3:db06:4200:93a1/128 +2600:9000:2764:7a00:3:db06:4200:93a1/128 +2600:9000:2764:0:3:db06:4200:93a1/128 +2a0b:7140:5:100::167/128 +2a0b:7140:5:100::167/128 +2606:50c0:8000::153/128 +2606:50c0:8001::153/128 +2606:50c0:8003::153/128 +2606:50c0:8002::153/128 +2606:50c0:8003::153/128 +2606:50c0:8002::153/128 +2606:50c0:8001::153/128 +2606:50c0:8000::153/128 +>>>>>>> Stashed changes diff --git a/OPNS_MirrorListV4 b/OPNS_MirrorListV4 index 54ac05d..cc70fe2 100644 --- a/OPNS_MirrorListV4 +++ b/OPNS_MirrorListV4 @@ -4,8 +4,16 @@ 216.24.182.173/32 162.105.120.100/32 104.21.112.1/32 +<<<<<<< Updated upstream 104.21.96.1/32 104.21.64.1/32 +======= +104.21.80.1/32 +104.21.96.1/32 +104.21.48.1/32 +104.21.64.1/32 +104.21.32.1/32 +>>>>>>> Stashed changes 104.21.16.1/32 104.21.32.1/32 104.21.80.1/32 @@ -23,15 +31,21 @@ 147.52.159.50/32 180.151.236.94/32 78.39.136.13/32 +<<<<<<< Updated upstream 104.22.44.100/32 104.22.45.100/32 172.67.14.249/32 112.222.241.182/32 122.99.224.11/32 122.99.224.12/32 +======= +172.67.14.249/32 +172.66.163.27/32 +112.222.241.182/32 +104.18.2.39/32 +104.18.3.39/32 +>>>>>>> Stashed changes 221.138.103.74/32 -14.80.36.53/32 -221.142.142.68/32 196.200.160.70/32 150.242.40.7/32 23.147.168.189/32 diff --git a/OPNS_MirrorListV6 b/OPNS_MirrorListV6 index 11ac7fd..306a415 100644 --- a/OPNS_MirrorListV6 +++ b/OPNS_MirrorListV6 @@ -1,9 +1,18 @@ 2001:388:30bc:cafe::beef/128 2001:da8:201:1120::a269:7864/128 +<<<<<<< Updated upstream 2606:4700:3030::6815:6001/128 2606:4700:3030::6815:4001/128 2606:4700:3030::6815:2001/128 2606:4700:3030::6815:3001/128 +======= +2606:4700:3030::6815:3001/128 +2606:4700:3030::6815:4001/128 +2606:4700:3030::6815:6001/128 +2606:4700:3030::6815:5001/128 +2606:4700:3030::6815:1001/128 +2606:4700:3030::6815:2001/128 +>>>>>>> Stashed changes 2606:4700:3030::6815:7001/128 2606:4700:3030::6815:1001/128 2606:4700:3030::6815:5001/128 @@ -16,11 +25,18 @@ 2a00:d0c0:d::100/128 2a00:c98:2030:a034::21/128 2001:648:2c00:6c08::2/128 +<<<<<<< Updated upstream 2606:4700:10::6816:2d64/128 2606:4700:10::ac43:ef9/128 2606:4700:10::6816:2c64/128 2606:4700::6812:227/128 2606:4700::6812:327/128 +======= +2606:4700:10::ac42:a31b/128 +2606:4700:10::ac43:ef9/128 +2606:4700::6812:327/128 +2606:4700::6812:227/128 +>>>>>>> Stashed changes 2001:4310:f1::70/128 2602:faa5:190::/128 2602:faa5:189::/128