Removed the compilation error

3ac51d21 · Anes Rose Rigiel Antony · e4335ef4 · 3ac51d21
Commit 3ac51d21 authored Jun 10, 2020 by Anes Rose Rigiel Antony
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

openair2/RRC/LTE/rrc_eNB.c openair2/RRC/LTE/rrc_eNB.c +0 -3

No files found.
--- 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
  }

 /*------------------------------------------------------------------------------*/