From 3cafcd72b9b92bc4ffa16e98942a9b8a1f4c0c43 Mon Sep 17 00:00:00 2001
From: Florian Kaltenberger <florian.kaltenberger@eurecom.fr>
Date: Tue, 7 May 2019 16:19:06 +0200
Subject: [PATCH] fixing a bad merge

---
 openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c b/openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c
index 0ba8bb58d6..acc8c321ca 100644
--- a/openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c
+++ b/openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c
@@ -2589,9 +2589,8 @@ unsigned short nr_dlsch_extract_rbs_dual(int **rxdataF,
 
   int prb,nb_rb=0;
   unsigned short k;
-  int i,aarx;
+  int i,j,aarx;
   int32_t *dl_ch0,*dl_ch0p,*dl_ch0_ext,*dl_ch1,*dl_ch1p,*dl_ch1_ext,*rxF,*rxF_ext;
-  int pilots=0,j=0;
 
   k = frame_parms->first_carrier_offset + 516; //0
 
-- 
2.26.2