merge conflice

This commit is contained in:
christoph.karls 2025-04-16 11:39:26 +02:00
parent b40d535cc6
commit 59c8af7c42

View file

@ -2,7 +2,7 @@ inet6num: fdc0:88e8:0644:0000:0000:0000:0000:0000 - fdc0:88e8:0644:fff
cidr: fdc0:88e8:644::/48
netname: CKARLS-v6-NETWORK
descr: v6 Network of ckarls
country: XD
country: DE
admin-c: CKARLS-DN42
tech-c: CKARLS-DN42
mnt-by: CKARLS-MNT