merge ocnflict for white background

This commit is contained in:
Dhanya Maliakal
2017-11-28 11:29:15 +01:00
17 changed files with 101 additions and 102 deletions

View File

@ -78,7 +78,7 @@ int BinaryFile::WriteToFile(char* buffer, int buffersize, uint64_t fnum, uint32_
numActualPacketsInFile += nump;
if (BinaryFileStatic::WriteDataFile(filefd, buffer, buffersize, fnum) == buffersize)
return OK;
bprintf(RED,"%d Error: Write to file failed for image number %lld\n", index, (long long int)fnum);
cprintf(RED,"%d Error: Write to file failed for image number %lld\n", index, (long long int)fnum);
return FAIL;
}