Resolve merge conflicts

luxonis · Feb 3, 2025 · 072b918 · 072b918
1 parent af052cd
commit 072b918
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/src/utility/Environment.hpp b/src/utility/Environment.hpp
@@ -142,5 +142,7 @@ T getEnvAsChecked(const std::string& var, T defaultValue, const std::vector<T>&
     return getEnvAsChecked<T>(var, defaultValue, possibleValues, Logging::getInstance().logger);
 }
 
+std::vector<std::string> splitList(const std::string& list, const std::string& delimiter);
+
 }  // namespace utility
 }  // namespace dai
diff --git a/src/utility/Logging.hpp b/src/utility/Logging.hpp
@@ -19,11 +19,6 @@
 #include <depthai/device/DeviceBootloader.hpp>
 #include <depthai/openvino/OpenVINO.hpp>
 #include <depthai/utility/Path.hpp>
-<<<<<<< HEAD
-=======
-
-#include "Environment.hpp"
->>>>>>> v3_develop
 
 namespace dai {