projects
/
stejau-blog.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
278c2a4
)
(no commit message)
author
stephan48
<stephan48@web>
Sat, 27 Apr 2024 23:59:05 +0000
(
01:59
+0200)
committer
IkiWiki
<ikiwiki.info>
Sat, 27 Apr 2024 23:59:05 +0000
(
01:59
+0200)
posts/2023-08-13-k3s-i-want-a-rootless-cluster-with-bgp-damn-it.mdwn
patch
|
blob
|
history
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 874f8a5346b1577cb43a650c584321d407afece1..4964116bced229c5f85155e2f39d650b6fa2a2de 100644
(file)
--- 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