From 05e96bb8feed0094d16d778ac86629b5f3d093f7 Mon Sep 17 00:00:00 2001 From: Logan007 Date: Tue, 12 May 2020 17:19:40 +0545 Subject: [PATCH] tried to resolve conflict --- edge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/edge.c b/edge.c index 16f2174..9a3c56d 100644 --- a/edge.c +++ b/edge.c @@ -441,7 +441,7 @@ static int loadFromCLI(int argc, char *argv[], n2n_edge_conf_t *conf, n2n_priv_c u_char c; while((c = getopt_long(argc, argv, - "k:a:bc:Eu:g:m:M:s:d:l:p:fvhrt:i:SDL:A::" + "k:a:bc:Eu:g:m:M:s:d:l:p:fvhrt:i:SDL:zA::" #ifdef __linux__ "T:" #endif