From dad6d287dbb30f0984bfab7be9b489e27dcfefc5 Mon Sep 17 00:00:00 2001
From: Patrick Spek <p.spek@tyil.nl>
Date: Fri, 5 Jan 2024 11:17:25 +0100
Subject: Add qohrei host

---
 data.d/vpn-wireguard/qohrei.tyil.net | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'data.d')

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
-- 
cgit v1.1