From 59c8af7c42b2086982395ec8b3b41fdf3848ecbf Mon Sep 17 00:00:00 2001
From: "christoph.karls" <christoph.karls@zema.de>
Date: Wed, 16 Apr 2025 11:39:26 +0200
Subject: [PATCH] merge conflice

---
 data/inet6num/fdc0:88e8:644::_48 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/inet6num/fdc0:88e8:644::_48 b/data/inet6num/fdc0:88e8:644::_48
index 50d167fd7..12314677e 100644
--- a/data/inet6num/fdc0:88e8:644::_48
+++ b/data/inet6num/fdc0:88e8:644::_48
@@ -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