From 52efc6ffad8db8c81408ea50c3b5f0f702840bbb Mon Sep 17 00:00:00 2001
From: Logan oos Even <46396513+Logan007@users.noreply.github.com>
Date: Thu, 9 Sep 2021 14:10:01 +0545
Subject: [PATCH] compilation fix

---
 src/edge.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/edge.c b/src/edge.c
index 581552e..46c5866 100644
--- a/src/edge.c
+++ b/src/edge.c
@@ -768,11 +768,7 @@ static int loadFromCLI (int argc, char *argv[], n2n_edge_conf_t *conf, n2n_tunta
     u_char c;
 
     while ((c = getopt_long(argc, argv,
-<<<<<<< HEAD
-                            "k:a:c:Eu:g:m:M:s:d:l:p:fvhrt:i:I:J:P:S::DL:z::A::Hn:R:"
-=======
-                            "k:a:b:c:Eu:g:m:M:s:d:l:p:fvhrt:i:I:J:P:S::DL:z::A::Hn:R:e:"
->>>>>>> 9772d7b (first draft)
+                            "k:a:c:Eu:g:m:M:s:d:l:p:fvhrt:i:I:J:P:S::DL:z::A::Hn:R:e:"
 #ifdef __linux__
                             "T:"
 #endif