From f0a63d1bf3e87b612a5219122cecace1603aad1e Mon Sep 17 00:00:00 2001
From: p3ls <st.konschak@wrba.ch>
Date: Fri, 8 Dec 2023 18:16:41 +0100
Subject: [PATCH] hb6oaj6

---
 test.txt | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/test.txt b/test.txt
index 3e95f3a..f7a6280 100644
--- a/test.txt
+++ b/test.txt
@@ -1,7 +1 @@
-<<<<<<< HEAD
-HgsnZm4
-||||||| 6af43c2
-RSskzSm
-=======
-XKKs9Q7
->>>>>>> 716f5b285f739649e93f8898c63926beedce02b3
+hb6oaj6
\ No newline at end of file