resolve merge conflict
This commit is contained in:
commit
44a380066d
|
@ -6,7 +6,7 @@
|
|||
|
||||
wireguard.interfaces = {
|
||||
wg0 = {
|
||||
ips = [ "10.100.0.1/24" ];
|
||||
ips = [ "10.100.0.2/24" ];
|
||||
listenPort = 51820;
|
||||
|
||||
privateKeyFile = "/home/usr/wg-keys/private";
|
||||
|
|
Loading…
Reference in New Issue