merge conflicts resolved

This commit is contained in:
Abhishek Kondur
2023-02-07 14:24:39 +04:00
83 changed files with 1616 additions and 3603 deletions

View File

@@ -161,8 +161,6 @@ type EgressGatewayRequest struct {
NatEnabled string `json:"natenabled" bson:"natenabled"`
Ranges []string `json:"ranges" bson:"ranges"`
Interface string `json:"interface" bson:"interface"`
PostUp string `json:"postup" bson:"postup"`
PostDown string `json:"postdown" bson:"postdown"`
}
// RelayRequest - relay request struct