To receive notifications about scheduled maintenance, please subscribe to the mailing-list gitlab-operations@sympa.ethz.ch. You can subscribe to the mailing-list at https://sympa.ethz.ch

Commit 273709ca authored by tiagos's avatar tiagos
Browse files

fixed missing merge conflict

parent 74ae13fb
......@@ -24,11 +24,7 @@
#include "UWBManagerService.h"
//#include "SerialUnix.h"
<<<<<<< HEAD
//#include "DataListener.h"
=======
#include "DataListener.h"
>>>>>>> 62ee0588a8aa8169683efb22f2bb8935f9e7fc3e
#define UWB_UPDATE_DISABLE 0
#define UWB_UPDATE_ENABLE 1
......@@ -134,7 +130,7 @@ void d_fall_pps::calibrateAnchors()
ROS_WARN("[UWBManagerService] Calibrating Anchors...");
selfLoc.startAnchorLocalistaion();
ROS_WARN("[UWBManagerService] Calibration done!");
/*Serial serial;
DataListener interpreter;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment