Manual merge of git.dn42.us:Wenjie_Zhou/registry (pull request #1441) to fix merge conflicts

This commit is contained in:
Simon Marsh 2020-04-17 12:11:46 +01:00
commit 81b6fdf2c9
No known key found for this signature in database
GPG key ID: 30B29A716A54DBB3
7 changed files with 0 additions and 50 deletions

View file

@ -1,10 +0,0 @@
inet6num: fd9c:bee3:3694:0000:0000:0000:0000:0000 - fd9c:bee3:3694:ffff:ffff:ffff:ffff:ffff
netname: WJZ-IPV6
descr: Peer with me at chain723@gmail.com
country: CN
admin-c: WJZ-DN42
tech-c: WJZ-DN42
mnt-by: WJZ-MNT
status: ASSIGNED
cidr: fd9c:bee3:3694::/48
source: DN42