resolve merge conflict

This commit is contained in:
stupidcomputer 2024-10-27 23:12:38 -05:00
commit 44a380066d

View File

@ -6,7 +6,7 @@
wireguard.interfaces = { wireguard.interfaces = {
wg0 = { wg0 = {
ips = [ "10.100.0.1/24" ]; ips = [ "10.100.0.2/24" ];
listenPort = 51820; listenPort = 51820;
privateKeyFile = "/home/usr/wg-keys/private"; privateKeyFile = "/home/usr/wg-keys/private";