From 118504546ecc41809ae4ef6b11789f9e220063f6 Mon Sep 17 00:00:00 2001
From: QuentinPerret <quentinprrt33@gmail.com>
Date: Tue, 9 May 2023 13:41:59 +0200
Subject: [PATCH] merge Data

---
 Code-C/main.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/Code-C/main.c b/Code-C/main.c
index 57796fa..3a20725 100644
--- a/Code-C/main.c
+++ b/Code-C/main.c
@@ -75,15 +75,9 @@ void *threadCalculBoth(void *vargp)
         {
             rawDataQueue = queueGetNextE(rawDataQueue);
             fileName = queueGetTabChar(rawDataQueue);
-<<<<<<< HEAD
-            power(fileName,nRow,nCol,period,invTimeBandWidth);
-            average(fileName,nRow,nCol);
-            //remove(fileName);
-=======
             powerFunction(fileName, NULL);
             averageFunction(fileName, NULL);
             remove(fileName);
->>>>>>> Data
         }
     }
     return NULL;