Skip to content
Snippets Groups Projects
Commit 81da0c08 authored by Phillip Thomas's avatar Phillip Thomas
Browse files

removed conflicts

parent a8922218
No related branches found
No related tags found
1 merge request!1Colored Point Cloud for Debug Drawer
......@@ -45,6 +45,9 @@
#include <boost/algorithm/string/predicate.hpp>
#include <VirtualRobot/Robot.h>
#include <VirtualRobot/XML/RobotIO.h>
#include <VirtualRobot/Visualization/CoinVisualization/CoinVisualizationFactory.h>
using namespace VirtualRobot;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment