Update nas_nrue_task.c

32036dae · cucengineer · 9dd227be · 32036dae
Commit 32036dae authored Nov 22, 2020 by cucengineer
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

openair3/NAS/NR_UE/nas_nrue_task.c openair3/NAS/NR_UE/nas_nrue_task.c +4 -0

No files found.
--- a/openair3/NAS/NR_UE/nas_nrue_task.c
+++ b/openair3/NAS/NR_UE/nas_nrue_task.c
@@ -327,6 +327,10 @@ int encode_authenticationresponse(authenticationresponse_t *authentication_respo

  return encoded;
 <<<<<<< HEAD
+<<<<<<< HEAD
+}
+>>>>>>> parent of d659e98df... Update nas_nrue_task.c
+=======
 }
 >>>>>>> parent of d659e98df... Update nas_nrue_task.c
 =======