mirror of
https://git.dn42.dev/dn42/registry.git
synced 2025-07-20 09:26:59 +08:00
Merge branch 'master' of https://git.dn42.dev/christoph.karls/registry
This commit is contained in:
commit
8530accdd6
1 changed files with 4 additions and 0 deletions
|
@ -5,6 +5,7 @@ cidr: 172.20.6.32/27
|
||||||
netname: CKARLS-v4-NETWORK
|
netname: CKARLS-v4-NETWORK
|
||||||
descr: v4 Network of ckarls
|
descr: v4 Network of ckarls
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
country: XD
|
country: XD
|
||||||
=======
|
=======
|
||||||
country: DE
|
country: DE
|
||||||
|
@ -23,6 +24,9 @@ country: DE
|
||||||
=======
|
=======
|
||||||
country: XD
|
country: XD
|
||||||
>>>>>>> dc7a812da (data/inetnum/172.20.6.32_27 aktualisiert)
|
>>>>>>> dc7a812da (data/inetnum/172.20.6.32_27 aktualisiert)
|
||||||
|
=======
|
||||||
|
country: DE
|
||||||
|
>>>>>>> a18cf88fff568218c4b34eed1c2f5fb36be3d4eb
|
||||||
admin-c: CKARLS-DN42
|
admin-c: CKARLS-DN42
|
||||||
tech-c: CKARLS-DN42
|
tech-c: CKARLS-DN42
|
||||||
mnt-by: CKARLS-MNT
|
mnt-by: CKARLS-MNT
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue