diff options
| author |  xiaobao <ilsanboo@gmail.com>
| 2020-03-04 13:14:18 +0800 |
|---|---|---|
| committer | xiaobao <ilsanboo@gmail.com>
| 2020-03-04 13:14:18 +0800 |
| commit | cd0cf552679b445ceaad95d4d6ee7b64fd53f937 (patch) | |
| tree | d5b660b67ddcba9f107fbc15c46828fa15dddd0c | |
| parent | update (diff) | |
| download | china_ip_list-cd0cf552679b445ceaad95d4d6ee7b64fd53f937.tar.gz china_ip_list-cd0cf552679b445ceaad95d4d6ee7b64fd53f937.tar.bz2 china_ip_list-cd0cf552679b445ceaad95d4d6ee7b64fd53f937.zip | |
update
| -rw-r--r-- | china_ip_list.txt | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/china_ip_list.txt b/china_ip_list.txt index 569d424..f2e1c91 100644 --- a/china_ip_list.txt +++ b/china_ip_list.txt @@ -2086,10 +2086,6 @@ 103.143.132.0/22 103.143.174.0/23 103.143.228.0/23 -<<<<<<< HEAD -======= -103.144.40.0/23 ->>>>>>> 953763ac5cf899322beaf216951989bec849e628 103.144.66.0/23 103.144.70.0/23 103.144.72.0/23 @@ -2098,10 +2094,6 @@ 103.145.40.0/22 103.145.73.0/24 103.145.80.0/23 -<<<<<<< HEAD -======= -103.145.86.0/23 ->>>>>>> 953763ac5cf899322beaf216951989bec849e628 103.145.90.0/23 103.145.92.0/22 103.145.98.0/23 @@ -2109,7 +2101,6 @@ 103.145.188.0/23 103.146.6.0/23 103.146.72.0/23 -<<<<<<< HEAD 103.146.90.0/23 103.146.126.0/23 103.146.138.0/23 @@ -2119,16 +2110,6 @@ 103.147.198.0/23 103.147.206.0/23 103.148.174.0/23 -======= -103.146.88.0/22 -103.146.126.0/23 -103.146.138.0/23 -103.146.230.0/23 -103.146.236.0/23 -103.146.252.0/23 -103.147.12.0/23 -103.147.124.0/23 ->>>>>>> 953763ac5cf899322beaf216951989bec849e628 103.192.0.0/19 103.192.48.0/21 103.192.56.0/22 @@ -3609,10 +3590,7 @@ 129.211.0.0/16 129.223.254.0/24 129.227.99.0/24 -<<<<<<< HEAD 130.36.146.0/23 -======= ->>>>>>> 953763ac5cf899322beaf216951989bec849e628 130.214.218.0/23 131.228.96.0/24 131.253.12.0/29 @@ -3780,11 +3758,6 @@ 150.242.248.0/22 150.255.0.0/16 152.32.178.0/23 -<<<<<<< HEAD -======= -152.32.249.0/24 -152.32.255.0/24 ->>>>>>> 953763ac5cf899322beaf216951989bec849e628 152.104.128.0/17 152.136.0.0/16 153.0.0.0/16 @@ -4045,10 +4018,6 @@ 183.192.0.0/10 185.109.236.0/24 185.216.118.0/24 -<<<<<<< HEAD -======= -185.224.116.0/22 ->>>>>>> 953763ac5cf899322beaf216951989bec849e628 188.131.128.0/17 192.11.23.0/24 192.11.26.0/24 @@ -4849,10 +4818,6 @@ 203.20.122.0/24 203.20.126.0/23 203.20.135.0/24 -<<<<<<< HEAD -======= -203.20.138.0/23 ->>>>>>> 953763ac5cf899322beaf216951989bec849e628 203.20.140.0/22 203.20.150.0/24 203.20.230.0/24 |