fix things
This commit is contained in:
parent
7478740a0a
commit
199d06538a
|
@ -143,7 +143,6 @@
|
|||
publicKey = "il12KBAwODC1TTZgT4JIL0f6AZcYWxylmuVlTlWd80s=";
|
||||
allowedIPs = [ "10.100.0.18/32" ];
|
||||
}
|
||||
<<<<<<< HEAD
|
||||
{ # Mari
|
||||
publicKey = "NfEjPn+ZYgB1vfNZ353AQOKPZLKUt4gPoNUSrywXjl0=";
|
||||
allowedIPs = [ "10.100.0.20/32" ]
|
||||
|
@ -152,7 +151,6 @@
|
|||
publicKey = "k+PkzHREDszWnzvY79JcBL2XCkwtQ/XSunxNft7pjwY=";
|
||||
allowedIPs = ["10.100.0.19/32"];
|
||||
}
|
||||
>>>>>>> f246dff (add witu)
|
||||
];
|
||||
};
|
||||
};
|
||||
|
|
Loading…
Reference in New Issue