reglt conflit
This commit is contained in:
@@ -6,7 +6,11 @@ AddressAwg=10.0.0.1/24 # Adresse VPN Wireguard extremite A
|
||||
EndpointA=172.16.0.122 # Adresse extremite A
|
||||
PortA=51820 # Port ecoute extremite A
|
||||
AddressBwg=10.0.0.2/24 # Adresse VPN Wireguard extremite B
|
||||
<<<<<<< HEAD:ansible/wireguard/mkwgconf.sh
|
||||
EndpointB=172.16.0.120 # Adresse extremite B
|
||||
=======
|
||||
EndpointB=172.16.0.121 # Adresse extremite B
|
||||
>>>>>>> d29ce732af0fce68c555df54563113473c3a0c5b:ansible/mkwgconf.sh
|
||||
PortB=51820 # Port ecoute extremite B
|
||||
AddressCwg=10.0.0.3/24 # Adresse VPN Wireguard extremite C
|
||||
EndpointC=172.16.0.121 # Adresse extremite C
|
||||
|
Reference in New Issue
Block a user