From 81da0c084d4f5355cb3d94fa7f981e651c131746 Mon Sep 17 00:00:00 2001
From: Phillip Thomas <phillipthomas@live.de>
Date: Mon, 28 Sep 2015 12:07:43 +0200
Subject: [PATCH] removed conflicts

---
 .../RobotAPI/components/DebugDrawer/DebugDrawerComponent.cpp   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/source/RobotAPI/components/DebugDrawer/DebugDrawerComponent.cpp b/source/RobotAPI/components/DebugDrawer/DebugDrawerComponent.cpp
index e5e8145e0..3efb757f2 100644
--- a/source/RobotAPI/components/DebugDrawer/DebugDrawerComponent.cpp
+++ b/source/RobotAPI/components/DebugDrawer/DebugDrawerComponent.cpp
@@ -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;
 
-- 
GitLab