merge conflict resolved

This commit is contained in:
Dhanya Maliakal
2017-12-01 12:44:34 +01:00
10 changed files with 98 additions and 93 deletions

View File

@ -47,7 +47,7 @@ DataStreamer::DataStreamer(Fifo*& f, uint32_t* dr, int* sEnable, uint64_t* fi) :
}
NumberofDataStreamers++;
FILE_LOG (logDEBUG) << "Number of DataStreamers: " << NumberofDataStreamers;
FILE_LOG(logDEBUG) << "Number of DataStreamers: " << NumberofDataStreamers;
strcpy(fileNametoStream, "");
}