diff options
| author | Patrick Spek <p.spek@tyil.nl> | 2024-01-05 12:19:35 +0100 |
|---|---|---|
| committer | Patrick Spek <p.spek@tyil.nl> | 2024-01-05 12:19:35 +0100 |
| commit | 40ddc0095d7e4b9e6740e88703ae3a7f9dda9c44 (patch) | |
| tree | 3da1ca3940b47e17bbba41297887e97f9e73a871 /data.d | |
| parent | e043a333a8830a44e14295b60f0d9b7aa02d2626 (diff) | |
Remove stashed changes
Diffstat (limited to 'data.d')
| -rw-r--r-- | data.d/vpn-wireguard/peers/qohrei.tyil.net | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/data.d/vpn-wireguard/peers/qohrei.tyil.net b/data.d/vpn-wireguard/peers/qohrei.tyil.net index a0a2224..0d1cd90 100644 --- a/data.d/vpn-wireguard/peers/qohrei.tyil.net +++ b/data.d/vpn-wireguard/peers/qohrei.tyil.net @@ -1,10 +1,4 @@ [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 |