sync/NeoNetwork
1
0
Fork 0
mirror of https://github.com/NeoCloud/NeoNetwork synced 2024-11-25 12:40:41 +08:00
Code Issues Releases Wiki Activity

Fix errors when merging and synchronize with upstream

Browse source
This commit is contained in:
Myer921 2020-03-27 13:28:45 +08:00
parent a11c863bec
commit 53932762d7
No known key found for this signature in database
GPG key ID: 9E1B111EDB23F381
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
routes.txt
View file

@ -33,13 +33,9 @@ Network ID Protocol Upstream Downstream Comment
Subnet Name Comment Subnet Name Comment
10.127.1.0/24 CROOM 10.127.1.0/24 CROOM
10.127.2.0/24 NeoSystems VMs 10.127.2.0/24 NeoSystems VMs
<<<<<<< HEAD
10.127.3.0/24 pan hub (for non-multihome connection in Taiwan) 10.127.3.0/24 pan hub (for non-multihome connection in Taiwan)
10.127.4.0/24 Icecat-Explosion (For Magicneko Explosion Network Interworking address) 10.127.4.0/24 Icecat-Explosion (For Magicneko Explosion Network Interworking address)
172.24.5.0/24 Icecat-Mobile-devices (For Mobile device internal network segment for testing connectivity quality, No SLA) 172.24.5.0/24 Icecat-Mobile-devices (For Mobile device internal network segment for testing connectivity quality, No SLA)
=======
10.127.3.0/24 pan hub for non-multihome connection in Taiwan
10.127.4.0/24 Icecat-Explosion For Magicneko Explosion Network Interworking address
+======================+ +======================+
@ -52,4 +48,4 @@ Loopback Address Name System Comment
10.127.255.2 ucbvax Arch Linux/frr 10.127.255.2 ucbvax Arch Linux/frr
10.127.255.4 pan Arch Linux/frr 10.127.255.4 pan Arch Linux/frr
10.127.255.80 NeoSystem Arch Linux/frr 10.127.255.80 NeoSystem Arch Linux/frr
>>>>>>> upstream/master