After rebasing the NR RRC PRACH procedure

2020-06-09 18:58:53 +05:45
parent b4651f2449 19a44bd092
commit e4335ef412
1 changed files with 3 additions and 0 deletions
@@ -9457,7 +9457,10 @@ rrc_enb_task(
      void rrc_go_nr(void);
      //if (go_nr) rrc_go_nr();
    }
+<<<<<<< HEAD
  }
+=======
+>>>>>>> 19a44bd0927547ffa58ffbcb51c840a8a770b84d
  }

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