maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix merge error.

Browse Source
This commit is contained in:
masayuki.harada
2020-10-28 03:19:41 +09:00
parent 5c49c67f98
commit 8cff73dc39
3 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair3/NGAP/ngap_gNB_nas_procedures.c
-4
View File
@@ -225,11 +225,7 @@ int ngap_gNB_handle_nas_first_req(
ie->value.choice.UserLocationInformation.present = NGAP_UserLocationInformation_PR_userLocationInformationNR;
<<<<<<< HEAD
ie->value.choice.UserLocationInformation.choice.userLocationInformationNR =
=======
ie->value.choice.UserLocationInformation.choice.userLocationInformationNR =
>>>>>>> b67badef1b2fd390d801e20644b08df0d5880583
CALLOC(1, sizeof(*ie->value.choice.UserLocationInformation.choice.userLocationInformationNR));
userinfo_nr_p = ie->value.choice.UserLocationInformation.choice.userLocationInformationNR;