From f211a482e630fd43f8879073e98c601ece7554d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20K=C3=BCthe?= <m.k@mk16.de>
Date: Sun, 29 Jan 2023 14:41:51 +0100
Subject: [PATCH] solve conflict
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Marek Küthe <m.k@mk16.de>

fix typo

Signed-off-by: Marek Küthe <m.k@mk16.de>
---
 data/inet6num/fda7:3ae7:e04d::_48 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/inet6num/fda7:3ae7:e04d::_48 b/data/inet6num/fda7:3ae7:e04d::_48
index 779d4ffc6..ef063db89 100644
--- a/data/inet6num/fda7:3ae7:e04d::_48
+++ b/data/inet6num/fda7:3ae7:e04d::_48
@@ -7,5 +7,5 @@ nserver:            b0l3yah-prototype.ty3r0x.dn42
 admin-c:            TY3R0X-DN42
 tech-c:             TY3R0X-DN42
 mnt-by:             TY3R0X-MNT
-status:             ASSIGNED
+status:             ALLOCATED
 source:             DN42