Fixed merge error leading to compile error.

gulrak · gulrak · commit e8ced30a8447 · 2019-05-04T08:59:21.000+02:00
diff --git a/test/filesystem_test.cpp b/test/filesystem_test.cpp
@@ -119,9 +119,9 @@ struct StringMaker<fs::file_time_type>
     {
         std::time_t t = to_time_t(value);
         std::tm* ptm = std::localtime(&t);
+        std::ostringstream os;
         if (ptm) {
             std::tm ttm = *ptm;
-            std::ostringstream os;
             os << std::put_time(&ttm, "%Y-%m-%d %H:%M:%S");
         }
         else {

Original file line number	Diff line number	Diff line change
`@@ -119,9 +119,9 @@ struct StringMaker<fs::file_time_type>`
`119`	`119`	`{`
`120`	`120`	`std::time_t t = to_time_t(value);`
`121`	`121`	`std::tm* ptm = std::localtime(&t);`
	`122`	`+ std::ostringstream os;`
`122`	`123`	`if (ptm) {`
`123`	`124`	`std::tm ttm = *ptm;`
`124`		`- std::ostringstream os;`
`125`	`125`	`os << std::put_time(&ttm, "%Y-%m-%d %H:%M:%S");`
`126`	`126`	`}`
`127`	`127`	`else {`