From: stephan48 <stephan48@web>
Date: Sat, 27 Apr 2024 23:59:05 +0000 (+0200)
Subject: (no commit message)
X-Git-Url: https://blog.stejau.de/gitweb/gitweb.cgi?a=commitdiff_plain;h=9facc37ae9c1b007a964db9c04943f728c6980b8;p=stejau-blog.git

---

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