From 94140ce3f4345a6683ffc52a12f38bc23d8064d8 Mon Sep 17 00:00:00 2001
From: "christoph.karls" <christoph.karls@noreply.dn42.dev>
Date: Tue, 15 Apr 2025 23:03:00 +0000
Subject: [PATCH] data/mntner/CKARLS-MNT aktualisiert

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

diff --git a/data/mntner/CKARLS-MNT b/data/mntner/CKARLS-MNT
index e19a1ca62..74836b8b6 100644
--- a/data/mntner/CKARLS-MNT
+++ b/data/mntner/CKARLS-MNT
@@ -2,9 +2,13 @@ mntner:             CKARLS-MNT
 admin-c:            CKARLS-DN42
 tech-c:             CKARLS-DN42
 <<<<<<< HEAD
+<<<<<<< HEAD
 auth:               ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKvYrk4qxU7JqbA5OXk+qHZAJjxrZG1erwjv8nqgw0uZ
 =======
 auth:               pgp-fingerprint ED49C58A2CBBF462ABD6432B5013633FE1F2E4F5
 >>>>>>> 4a57b777e (data/mntner/CKARLS-MNT hinzugefügt)
+=======
+auth:               ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMiPIkSrp07kZDawYQkrq4vsvPc97qoz6KvpZSKyh/1P
+>>>>>>> 942fdc1bc (data/mntner/CKARLS-MNT aktualisiert)
 mnt-by:             CKARLS-MNT
 source:             DN42
\ No newline at end of file