Removed the compilation error

2020-06-10 19:47:32 +05:30
parent e4335ef412
commit 3ac51d2115
1 changed files with 0 additions and 3 deletions
@@ -9457,10 +9457,7 @@ rrc_enb_task(
      void rrc_go_nr(void);
      //if (go_nr) rrc_go_nr();
    }
-<<<<<<< HEAD
  }
-=======
->>>>>>> 19a44bd0927547ffa58ffbcb51c840a8a770b84d
  }

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