summaryrefslogtreecommitdiff
path: root/data.d
diff options
context:
space:
mode:
authorPatrick Spek <p.spek@tyil.nl>2024-01-05 11:17:25 +0100
committerPatrick Spek <p.spek@tyil.nl>2024-01-05 11:17:25 +0100
commitdad6d287dbb30f0984bfab7be9b489e27dcfefc5 (patch)
tree77841eeeceac224aa8b3c81f17787c2918708bc4 /data.d
parente16f5a48b612f2e567e2d6fd94bf2b65dcdb57e8 (diff)
Add qohrei host
Diffstat (limited to 'data.d')
-rw-r--r--data.d/vpn-wireguard/qohrei.tyil.net6
1 files changed, 6 insertions, 0 deletions
diff --git a/data.d/vpn-wireguard/qohrei.tyil.net b/data.d/vpn-wireguard/qohrei.tyil.net
index 0d1cd90..a0a2224 100644
--- a/data.d/vpn-wireguard/qohrei.tyil.net
+++ b/data.d/vpn-wireguard/qohrei.tyil.net
@@ -1,4 +1,10 @@
[Peer]
+<<<<<<< Updated upstream
AllowedIPs = fd68:1e45:bc6c:4c7b::57:50:1/128
Endpoint = [2a01:4f9:c012:6273::1]:51820
PublicKey = 4BGxVjgNlFKOlomQSfxfsQs7y7hLbcK7iQyBs7Cf5mk=
+=======
+AllowedIPs = fd68:1e45:bc6c:4c7b::/64
+Endpoint = [2a01:4f9:c012:6273::1]:52345
+PublicKey = LY+L8jGdQwn545m71oBazey1QdJliibz1ejf3wpMgy0=
+>>>>>>> Stashed changes