From 9facc37ae9c1b007a964db9c04943f728c6980b8 Mon Sep 17 00:00:00 2001
From: stephan48 <stephan48@web>
Date: Sun, 28 Apr 2024 01:59:05 +0200
Subject: [PATCH]

---
 ...08-13-k3s-i-want-a-rootless-cluster-with-bgp-damn-it.mdwn | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/posts/2023-08-13-k3s-i-want-a-rootless-cluster-with-bgp-damn-it.mdwn b/posts/2023-08-13-k3s-i-want-a-rootless-cluster-with-bgp-damn-it.mdwn
index 874f8a5..4964116 100644
--- a/posts/2023-08-13-k3s-i-want-a-rootless-cluster-with-bgp-damn-it.mdwn
+++ b/posts/2023-08-13-k3s-i-want-a-rootless-cluster-with-bgp-damn-it.mdwn
@@ -60,7 +60,12 @@ IPv6:
 
 Yes because i am a masochist.
 
+<<<<<<< HEAD
 <a name="test"></a># Test
+=======
+<a name="test"></a>
+# Test
+>>>>>>> b2cf31a16ba8abe125ad1307f2a40d457c1e3ce9
 
 Test Heading
 
-- 
2.30.2