Skip to content
Snippets Groups Projects

Aron/dev

Merged Aron/dev
aron/dev into master
Merged Fabian Tërnava requested to merge aron/dev into master
Compare
and
8 files
+ 13
− 33
Compare changes
  • Side-by-side
  • Inline
Files
8
source/armarx/navigation/core/json_conversions.h
+ 1
− 1
@@ -23,7 +23,7 @@
#include <SimoxUtility/json/json.hpp>
#include <RobotAPI/libraries/aron/core/codegenerator/codewriter/cpp/AronGeneratedClass.h>
#include <RobotAPI/libraries/aron/core/codegeneration/cpp/AronGeneratedClass.h>
#include <RobotAPI/libraries/aron/core/data/rw/reader/nlohmannJSON/NlohmannJSONReader.h>
#include <RobotAPI/libraries/aron/core/data/rw/writer/nlohmannJSON/NlohmannJSONWriter.h>