From: stephan48 <stephan48@web>
Date: Sat, 27 Apr 2024 23:59:48 +0000 (+0200)
Subject: (no commit message)
X-Git-Url: https://blog.stejau.de/gitweb/gitweb.cgi?a=commitdiff_plain;h=934898de28f688c27efa264539e85232ca9d8043;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 4964116..d7d7e38 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,16 +60,10 @@ IPv6:
 
 Yes because i am a masochist.
 
-<<<<<<< HEAD
-<a name="test"></a># Test
-=======
 <a name="test"></a>
 # Test
->>>>>>> b2cf31a16ba8abe125ad1307f2a40d457c1e3ce9
-
 Test Heading
 
-
 # Graphical Depiction of Network Setup
 
 Click on shapes to get to the respective part of the documentation.