From b223ac4e8acc07ac5df8718c2ed87cc392d9fda1 Mon Sep 17 00:00:00 2001
From: Lionel Gauthier <lionel.gauthier@eurecom.fr>
Date: Fri, 20 Dec 2013 16:04:27 +0000
Subject: [PATCH] ooops
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@4803 818b1a75-f10b-46b9-bf7c-635c3b92a50f
---
openair2/RRC/LITE/rrc_UE.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/openair2/RRC/LITE/rrc_UE.c b/openair2/RRC/LITE/rrc_UE.c
index 79cff7bb59..92ce85d813 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);
--
GitLab