fixes after merge

2020-08-21 15:50:27 +02:00
parent 38f01abd77
commit 038a80b2ff
2 changed files with 1 additions and 6 deletions
@@ -1324,14 +1324,8 @@ int main ( int argc, char **argv ) {

  // end of CI modifications
  //getchar();
-<<<<<<< HEAD
-  if(IS_SOFTMODEM_DOFORMS) {
-    load_softscope("enb",NULL);
-  }
-=======
  if(IS_SOFTMODEM_DOFORMS)
    load_softscope("enb", NULL);
->>>>>>> 7f28f8d10dc0d73fd4b10d4a89fde554158f9fb5

  itti_wait_tasks_end();
  oai_exit=1;