From ba2a3884fc52bb0199438ae997f9320195c2bda5 Mon Sep 17 00:00:00 2001
From: "christoph.karls" <christoph.karls@noreply.dn42.dev>
Date: Tue, 15 Apr 2025 22:59:46 +0000
Subject: [PATCH] =?UTF-8?q?data/mntner/CKARLS-MNT=20hinzugef=C3=BCgt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/mntner/CKARLS-MNT | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/data/mntner/CKARLS-MNT b/data/mntner/CKARLS-MNT
index 33aa70c72..e19a1ca62 100644
--- a/data/mntner/CKARLS-MNT
+++ b/data/mntner/CKARLS-MNT
@@ -1,6 +1,10 @@
 mntner:             CKARLS-MNT
 admin-c:            CKARLS-DN42
 tech-c:             CKARLS-DN42
+<<<<<<< HEAD
 auth:               ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKvYrk4qxU7JqbA5OXk+qHZAJjxrZG1erwjv8nqgw0uZ
+=======
+auth:               pgp-fingerprint ED49C58A2CBBF462ABD6432B5013633FE1F2E4F5
+>>>>>>> 4a57b777e (data/mntner/CKARLS-MNT hinzugefügt)
 mnt-by:             CKARLS-MNT
 source:             DN42
\ No newline at end of file