fixed example and bench

This commit is contained in:
gabime
2014-12-07 06:54:25 +02:00
parent 04c116315a
commit 7f174a2b2f
2 changed files with 2 additions and 6 deletions

View File

@@ -52,11 +52,7 @@ int main(int argc, char* argv[])
int howmany = 1048576;
int threads = 10;
<<<<<<< HEAD
bool auto_flush = false;
=======
bool auto_flush = false;
>>>>>>> cppformat
int file_size = 30 * 1024 * 1024;
int rotating_files = 5;