From 3ac51d2115e2eaafa2a22ea66008db3e00929836 Mon Sep 17 00:00:00 2001
From: Anes Rose Rigiel Antony <ra.anes@globaledgesoft.com>
Date: Wed, 10 Jun 2020 19:47:32 +0530
Subject: [PATCH] Removed the compilation error

---
 openair2/RRC/LTE/rrc_eNB.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/openair2/RRC/LTE/rrc_eNB.c b/openair2/RRC/LTE/rrc_eNB.c
index 8d9ce955a0..cfafd28983 100644
--- a/openair2/RRC/LTE/rrc_eNB.c
+++ b/openair2/RRC/LTE/rrc_eNB.c
@@ -9457,10 +9457,7 @@ rrc_enb_task(
       void rrc_go_nr(void);
       //if (go_nr) rrc_go_nr();
     }
-<<<<<<< HEAD
   }
-=======
->>>>>>> 19a44bd0927547ffa58ffbcb51c840a8a770b84d
   }
 
 /*------------------------------------------------------------------------------*/