From 2795be57e38e78c577d411d513658660b65e6b1f Mon Sep 17 00:00:00 2001
From: lihaha11 <q123456789042@outlook.com>
Date: Sat, 10 May 2025 15:21:35 +0000
Subject: [PATCH] squashed commit:

d46211e06 	modified:   fd66:97fe:21c2::_48
2f1b51ae5 	new file:   data/aut-num/AS4242422519 	new file:   data/inet6num/fd66:97fe:21c2::_48 	new file:   data/inetnum/172.20.227.0_26 	new file:   data/mntner/LANCAN-MNT 	new file:   data/person/LIHAHA11-DN42 	new file:   data/route/172.20.227.0_26 	new file:   data/route6/fd66:97fe:21c2::_48

	modified:   data/inet6num/fd66:97fe:21c2::_48
---
 data/inet6num/fd66:97fe:21c2::_48 | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/data/inet6num/fd66:97fe:21c2::_48 b/data/inet6num/fd66:97fe:21c2::_48
index f8154c069..31fbcee75 100644
--- a/data/inet6num/fd66:97fe:21c2::_48
+++ b/data/inet6num/fd66:97fe:21c2::_48
@@ -6,5 +6,9 @@ admin-c:            LIHAHA11-DN42
 tech-c:             LIHAHA11-DN42
 mnt-by:             LANCAN-MNT
 status:             ASSIGNED
+<<<<<<< HEAD
 cidr:               fd66:97fe:21c2::_48
+=======
+cidr:               fd66:97fe:21c2::/48
+>>>>>>> 147fd5b86 (squashed commit:)
 source:             DN42