From b2929ce9f5f8e6cd4cd3ff35814bbb0910077cc1 Mon Sep 17 00:00:00 2001
From: cucengineer <2702919197@qq.com>
Date: Sun, 22 Nov 2020 21:41:40 +0800
Subject: [PATCH] Update nas_nrue_task.c

---
 openair3/NAS/NR_UE/nas_nrue_task.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/openair3/NAS/NR_UE/nas_nrue_task.c b/openair3/NAS/NR_UE/nas_nrue_task.c
index d2740c2a1a..30d89160e6 100644
--- a/openair3/NAS/NR_UE/nas_nrue_task.c
+++ b/openair3/NAS/NR_UE/nas_nrue_task.c
@@ -330,9 +330,4 @@ int encode_authenticationresponse(authenticationresponse_t *authentication_respo
 <<<<<<< HEAD
 }
 >>>>>>> parent of d659e98df... Update nas_nrue_task.c
-=======
 }
->>>>>>> parent of d659e98df... Update nas_nrue_task.c
-=======
-}
->>>>>>> parent of d659e98df... Update nas_nrue_task.c
-- 
2.26.2