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 conflice

Browse source
This commit is contained in:
christoph.karls 2025-04-16 11:39:26 +02:00
parent 0df26fed45
commit 447b19cbc0
1 changed files with 0 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,55 +1,12 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 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
=======
inet6num: fdc0:88e8:6440:0000:0000:0000:0000 - fdc0:88e8:644f:ffff:ffff:ffff:ffff:ffff
=======
inet6num: fdc0:88e8:0644:0000:0000:0000:0000 - fdc0:88e8:0644:ffff:ffff:ffff:ffff:ffff
>>>>>>> d7de0a540 (data/inet6num/fdc0:88e8:644::_48 aktualisiert)
cidr: fdc0:88e8:644::/48
<<<<<<< HEAD
netname: CKARLS-NETWORK
descr: Network of ckarls
>>>>>>> 9a1c4c8a9 (data/inet6num/fdc0:88e8:644::_48 hinzugefügt)
=======
netname: CKARLS-v6-NETWORK
descr: v6 Network of ckarls
>>>>>>> 9ef4d12b3 (data/inet6num/fdc0:88e8:644::_48 aktualisiert)
country: DE country: DE
=======
country: XD
>>>>>>> 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
nserver: ns1.ckarls.dn42 nserver: ns1.ckarls.dn42
nserver: ns2.ckarls.dn42 nserver: ns2.ckarls.dn42
=======
>>>>>>> 9a1c4c8a9 (data/inet6num/fdc0:88e8:644::_48 hinzugefügt)
=======
nserver: ns1.ckarls.dn42
nserver: ns2.ckarls.dn42
>>>>>>> fe8de7dd0 (data/inet6num/fdc0:88e8:644::_48 aktualisiert)
=======
nserver: ns1.ckarls.dn42
nserver: ns2.ckarls.dn42
>>>>>>> refs/remotes/origin/master
source: DN42 source: DN42