From 7fcf6271cb2a8158df27f2dae459036933067e2d Mon Sep 17 00:00:00 2001
From: "christoph.karls" <christoph.karls@noreply.dn42.dev>
Date: Wed, 16 Apr 2025 07:23:01 +0000
Subject: [PATCH] data/inetnum/172.20.6.32_27 aktualisiert

---
 data/inetnum/172.20.6.32_27 | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/data/inetnum/172.20.6.32_27 b/data/inetnum/172.20.6.32_27
index 0edbab325..6bf4f6d1c 100644
--- a/data/inetnum/172.20.6.32_27
+++ b/data/inetnum/172.20.6.32_27
@@ -1,4 +1,5 @@
 <<<<<<< HEAD
+<<<<<<< HEAD
 inetnum:            172.20.6.32 - 172.20.6.63
 cidr:               172.20.6.32/27
 netname:            CKARLS-v4-NETWORK
@@ -10,6 +11,9 @@ country:            DE
 >>>>>>> 414f08b1c (data/mntner/CKARLS-MNT hinzugefügt)
 =======
 inetnum:            172.20.6.33 - 172.20.6.62
+=======
+inetnum:            172.20.6.32 - 172.20.6.63
+>>>>>>> a2accc107 (data/inetnum/172.20.6.32_27 aktualisiert)
 cidr:               172.20.6.32/27
 netname:            CKARLS-v4-NETWORK
 descr:              v4 Network of ckarls