fixed merge conflicts

2021-07-24 07:15:24 +02:00
parent 5e960f118f ac146339a2
commit a918c672a5
16 changed files with 59 additions and 29 deletions
--- a/serviceinterface/ServiceInterfaceStream.cpp
+++ b/serviceinterface/ServiceInterfaceStream.cpp
@@ -19,9 +19,11 @@ bool ServiceInterfaceStream::crAdditionEnabled() const {
    return streambuf.crAdditionEnabled();
 }

+#if FSFW_COLORED_OUTPUT == 1
 void ServiceInterfaceStream::setAsciiColorPrefix(std::string asciiColorCode) {
    streambuf.setAsciiColorPrefix(asciiColorCode);
 }
+#endif

 #endif