diff --git a/openair2/RRC/LITE/rrc_UE.c b/openair2/RRC/LITE/rrc_UE.c index 79cff7bb59b125919e6f6f7a989969ce6f1e6ea0..92ce85d813e631524153f9972f87df0c52f16639 100644 --- a/openair2/RRC/LITE/rrc_UE.c +++ b/openair2/RRC/LITE/rrc_UE.c @@ -2488,13 +2488,8 @@ void *rrc_ue_task(void *args_p) { const char *msg_name; instance_t instance; unsigned int Mod_id; -<<<<<<< .mine - int result; - SRB_INFO *srb_info_p; -======= int result; SRB_INFO *srb_info_p; ->>>>>>> .r4801 itti_mark_task_ready (TASK_RRC_UE);