From ee64a389f61fbf9892c27e44789a55bd178f896f Mon Sep 17 00:00:00 2001 From: "christoph.karls" Date: Tue, 15 Apr 2025 23:20:14 +0000 Subject: [PATCH] =?UTF-8?q?data/inetnum/172.20.6.32=5F27=20hinzugef=C3=BCg?= =?UTF-8?q?t?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/inetnum/172.20.6.32_27 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/data/inetnum/172.20.6.32_27 b/data/inetnum/172.20.6.32_27 index b368198bf..6f1adbe60 100644 --- a/data/inetnum/172.20.6.32_27 +++ b/data/inetnum/172.20.6.32_27 @@ -1,3 +1,4 @@ +<<<<<<< HEAD inetnum: 172.20.6.32 - 172.20.6.63 cidr: 172.20.6.32/27 netname: CKARLS-v4-NETWORK @@ -7,10 +8,20 @@ country: XD ======= country: DE >>>>>>> 414f08b1c (data/mntner/CKARLS-MNT hinzugefügt) +======= +inetnum: 172.20.6.33 - 172.20.6.62 +cidr: 172.20.6.32/27 +netname: CKARLS-v4-NETWORK +descr: v4 Network of ckarls +country: DE +>>>>>>> 86c74557b (data/inetnum/172.20.6.32_27 hinzugefügt) admin-c: CKARLS-DN42 tech-c: CKARLS-DN42 mnt-by: CKARLS-MNT status: ASSIGNED +<<<<<<< HEAD nserver: ns1.ckarls.dn42 nserver: ns2.ckarls.dn42 +======= +>>>>>>> 86c74557b (data/inetnum/172.20.6.32_27 hinzugefügt) source: DN42 \ No newline at end of file