From 53932762d779d60c8ac14bc8e8247573d0db9d16 Mon Sep 17 00:00:00 2001 From: Myer921 Date: Fri, 27 Mar 2020 13:28:45 +0800 Subject: [PATCH] Fix errors when merging and synchronize with upstream --- routes.txt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/routes.txt b/routes.txt index 8b44915..7fdfc6c 100644 --- a/routes.txt +++ b/routes.txt @@ -33,13 +33,9 @@ Network ID Protocol Upstream Downstream Comment Subnet Name Comment 10.127.1.0/24 CROOM 10.127.2.0/24 NeoSystems VMs -<<<<<<< HEAD 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) 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.4 pan Arch Linux/frr 10.127.255.80 NeoSystem Arch Linux/frr ->>>>>>> upstream/master +