dn42/registry
1
0
Fork 0
mirror of https://git.dn42.dev/dn42/registry.git synced 2025-07-20 09:26:59 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Resolve merge conflicts

Browse source
This commit is contained in:
people future 2024-10-27 10:06:51 +08:00
commit be9e00c083
No known key found for this signature in database
GPG key ID: C13109F9EB3444E7
2 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
data/route/172.23.99.96_27
View file

@ -1,5 +1,9 @@
route: 172.23.99.96/27
<<<<<<< HEAD
max-length: 27
origin: AS4242423323
=======
origin: AS4242420001
>>>>>>> 762f6f462ff0e8d2ae6c5add0d0a7c7b90320f3f
mnt-by: YUZHEQIANLV-MNT
source: DN42

4
data/route6/fd9f:9b3f:da38::_48
View file

@ -1,5 +1,9 @@
route6: fd9f:9b3f:da38::/48
<<<<<<< HEAD
max-length: 48
origin: AS4242423323
=======
origin: AS4242420001
>>>>>>> 762f6f462ff0e8d2ae6c5add0d0a7c7b90320f3f
mnt-by: YUZHEQIANLV-MNT
source: DN42