merge Data

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;