eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 121 Wiki Activity

fixed merge conflicts

Browse Source
This commit is contained in:
Jakob Meier
2021-12-14 19:57:35 +01:00
parent 58074f9bfd 9983acf98b
commit 5067519b8a
23 changed files with 283 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bsp_q7s/core/InitMission.cpp
View File

@ -22,7 +22,7 @@
ServiceInterfaceStream sif::debug("DEBUG");
ServiceInterfaceStream sif::info("INFO");
ServiceInterfaceStream sif::warning("WARNING");
ServiceInterfaceStream sif::error("ERROR", false, false, true);
ServiceInterfaceStream sif::error("ERROR");
#else
ServiceInterfaceStream sif::debug("DEBUG", true);
ServiceInterfaceStream sif::info("INFO", true);