fix dlsim dlsch parallelisation

openair1/SCHED_NR_UE/phy_procedures_nr_ue.c

@@ -1738,7 +1738,6 @@ int phy_procedures_nrUE_RX(PHY_VARS_NR_UE *ue,
   curMsg->proc = *proc;
   curMsg->UE = ue;
   pushTpool(&(get_nrUE_params()->Tpool), newElt);
-
   start_meas(&ue->generic_stat);
   // do procedures for C-RNTI
   int ret_pdsch = 0;
@@ -1865,10 +1864,8 @@ int phy_procedures_nrUE_RX(PHY_VARS_NR_UE *ue,
 
  }
 
->>>>>>> fix dlsim dlsch parallelisation
 start_meas(&ue->generic_stat);
 
-
 #if 0
 
   if(nr_slot_rx==5 &&  ue->dlsch[proc->thread_id][gNB_id][0]->harq_processes[ue->dlsch[proc->thread_id][gNB_id][0]->current_harq_pid]->nb_rb > 20){