RESOLVED build errors

2020-11-24 18:49:41 +05:30
parent 87105d77cf
commit 56db8f4915
74 changed files with 265 additions and 2350 deletions
@@ -957,11 +957,7 @@ if(!IS_SOFTMODEM_NOS1)
  // once all RUs are ready initialize the rest of the gNBs ((dependence on final RU parameters after configuration)
  printf("ALL RUs ready - init gNBs\n");
  if(IS_SOFTMODEM_DOFORMS) {
-<<<<<<< HEAD
-  	
-=======
    sleep(1);	
->>>>>>> fork_develop_new
    scopeParms_t p;
    p.argc=&argc;
    p.argv=argv;