fix merge conflicts

Author: Lana243

server/src/printers/CoverageAndResultsStatisticsPrinter.cpp

@@ -1,4 +1,5 @@
 #include <utils/FileSystemUtils.h>
+
 #include "CoverageAndResultsStatisticsPrinter.h"
 #include "utils/StringUtils.h"
 #include "utils/CollectionUtils.h"

server/src/printers/CoverageAndResultsStatisticsPrinter.h

@@ -29,12 +29,11 @@ namespace printer {
     public:
         explicit CoverageAndResultsStatisticsPrinter(fs::path resultsDirectory) : resultsDirectory(
                 std::move(resultsDirectory)) {};
-
         void write(const utbot::ProjectContext &, const Coverage::TestResultMap &, const Coverage::CoverageMap &);
 
     private:
         fs::path resultsDirectory;
     };
 }
 
-#endif //UNITTESTBOT_COVERAGEANDRESULTSSTATISTICSPRINTER_H
+#endif //UNITTESTBOT_COVERAGEANDRESULTSSTATISTICSPRINTER_H

server/src/streams/coverage/CLICoverageAndResultsWriter.cpp

@@ -62,7 +62,6 @@ void CLICoverageAndResultsWriter::writeResponse(const utbot::ProjectContext &pro
     fs::path resultsFilePath = resultsDirectory / (TimeUtils::getDate() + ".log");
     FileSystemUtils::writeToFile(resultsFilePath, ss.str());
     LOG_S(INFO) << ss.str();
-
     printer::CoverageAndResultsStatisticsPrinter statsPrinter = printer::CoverageAndResultsStatisticsPrinter(
             resultsDirectory);
     statsPrinter.write(projectContext, testsResultMap, coverageMap);