From 9b207834e7caacc15d4993d89da18a98ce0492e2 Mon Sep 17 00:00:00 2001
From: laurent <laurent Thomas>
Date: Mon, 22 Aug 2022 10:32:46 +0200
Subject: [PATCH] merge conflict fix

---
 openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c b/openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
index 3be0b096e7..64a70ba974 100644
--- a/openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
+++ b/openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
@@ -591,13 +591,9 @@ uint32_t nr_dlsch_decoding(PHY_VARS_NR_UE *phy_vars_ue,
     //////////////////////////////////////////////////////////////////////////////////////////
   }
   for (r=0; r<nbDecode; r++) {
-<<<<<<< HEAD
-    notifiedFIFO_elt_t *req=pullTpool(&nf, &(pool_dl));
+    notifiedFIFO_elt_t *req=pullTpool(&nf,  &get_nrUE_params()->Tpool);
     if (req == NULL)
       break; // Tpool has been stopped
-=======
-    notifiedFIFO_elt_t *req=pullTpool(&nf, &get_nrUE_params()->Tpool);
->>>>>>> e9caae6f99 (simplify thread pool configuration)
     bool last = false;
     if (r == nbDecode - 1)
       last = true;