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

Merge remote-tracking branch 'refs/remotes/origin/master'

Browse source
This commit is contained in:
christoph.karls 2025-04-16 11:34:59 +02:00
commit 0df26fed45
2 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

12
data/inet6num/fdc0:88e8:644::_48
View file

@ -1,13 +1,17 @@
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
======= =======
>>>>>>> f0a9d1b39 (data/inet6num/fdc0:88e8:644::_48 aktualisiert) >>>>>>> f0a9d1b39 (data/inet6num/fdc0:88e8:644::_48 aktualisiert)
=======
>>>>>>> refs/remotes/origin/master
inet6num: fdc0:88e8:0644:0000:0000:0000:0000:0000 - fdc0:88e8:0644:ffff:ffff:ffff:ffff:ffff inet6num: fdc0:88e8:0644:0000:0000:0000:0000:0000 - fdc0:88e8:0644:ffff:ffff:ffff:ffff:ffff
cidr: fdc0:88e8:644::/48 cidr: fdc0:88e8:644::/48
netname: CKARLS-v6-NETWORK netname: CKARLS-v6-NETWORK
descr: v6 Network of ckarls descr: v6 Network of ckarls
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
======= =======
inet6num: fdc0:88e8:6440:0000:0000:0000:0000 - fdc0:88e8:644f:ffff:ffff:ffff:ffff:ffff inet6num: fdc0:88e8:6440:0000:0000:0000:0000 - fdc0:88e8:644f:ffff:ffff:ffff:ffff:ffff
======= =======
@ -26,12 +30,16 @@ country: DE
======= =======
country: XD country: XD
>>>>>>> fe8de7dd0 (data/inet6num/fdc0:88e8:644::_48 aktualisiert) >>>>>>> fe8de7dd0 (data/inet6num/fdc0:88e8:644::_48 aktualisiert)
=======
country: DE
>>>>>>> refs/remotes/origin/master
admin-c: CKARLS-DN42 admin-c: CKARLS-DN42
tech-c: CKARLS-DN42 tech-c: CKARLS-DN42
mnt-by: CKARLS-MNT mnt-by: CKARLS-MNT
status: ASSIGNED status: ASSIGNED
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
nserver: ns1.ckarls.dn42 nserver: ns1.ckarls.dn42
nserver: ns2.ckarls.dn42 nserver: ns2.ckarls.dn42
======= =======
@ -40,4 +48,8 @@ nserver: ns2.ckarls.dn42
nserver: ns1.ckarls.dn42 nserver: ns1.ckarls.dn42
nserver: ns2.ckarls.dn42 nserver: ns2.ckarls.dn42
>>>>>>> fe8de7dd0 (data/inet6num/fdc0:88e8:644::_48 aktualisiert) >>>>>>> fe8de7dd0 (data/inet6num/fdc0:88e8:644::_48 aktualisiert)
=======
nserver: ns1.ckarls.dn42
nserver: ns2.ckarls.dn42
>>>>>>> refs/remotes/origin/master
source: DN42 source: DN42

2
data/inetnum/172.20.6.32_27
View file

@ -2,7 +2,7 @@ inetnum: 172.20.6.32 - 172.20.6.63
cidr: 172.20.6.32/27 cidr: 172.20.6.32/27
netname: CKARLS-v4-NETWORK netname: CKARLS-v4-NETWORK
descr: v4 Network of ckarls descr: v4 Network of ckarls
country: XD country: DE
admin-c: CKARLS-DN42 admin-c: CKARLS-DN42
tech-c: CKARLS-DN42 tech-c: CKARLS-DN42
mnt-by: CKARLS-MNT mnt-by: CKARLS-MNT