From 54160e540c95ad81f9345b4572e2044fa852300b Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 21 Jun 2022 11:15:21 +0200 Subject: [PATCH] fix --- example/utility/utility.cpp | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/example/utility/utility.cpp b/example/utility/utility.cpp index 8750d8d..e098342 100644 --- a/example/utility/utility.cpp +++ b/example/utility/utility.cpp @@ -8,25 +8,9 @@ void utility::commonInitPrint(const char *const os, const char *const board) { if (os == nullptr or board == nullptr) { return; } -<<<<<<< HEAD fmt::print("-- FSFW Example ({}) v{}.{}.{} --\n", os, FSFW_EXAMPLE_VERSION, FSFW_EXAMPLE_SUBVERSION, FSFW_EXAMPLE_REVISION); fmt::print("-- Compiled for {}\n", board); fmt::print("-- Compiled on {} {}\n", __DATE__, __TIME__); sif::initialize(); -======= -#if FSFW_CPP_OSTREAM_ENABLED == 1 - std::cout << "-- FSFW Example (" << os << ") v" << FSFW_EXAMPLE_VERSION << "." - << FSFW_EXAMPLE_SUBVERSION << "." << FSFW_EXAMPLE_REVISION << " --" - << std::endl; - std::cout << "-- Compiled for " << board << " --" << std::endl; - std::cout << "-- Compiled on " << __DATE__ << " " << __TIME__ << " --" - << std::endl; -#else - printf("\n\r-- FSFW Example (%s) v%d.%d.%d --\n", os, FSFW_EXAMPLE_VERSION, - FSFW_EXAMPLE_SUBVERSION, FSFW_EXAMPLE_REVISION); - printf("-- Compiled for %s --\n", board); - printf("-- Compiled on %s %s --\n", __DATE__, __TIME__); -#endif ->>>>>>> origin/master }