From 2a62cf3bf6d1895883a735aff172d66fc74e459b Mon Sep 17 00:00:00 2001 From: douglaswsilva Date: Mon, 4 Mar 2019 14:06:48 -0800 Subject: [PATCH] Resolve merge conflicts. --- backend/src/grpc_server.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/backend/src/grpc_server.h b/backend/src/grpc_server.h index 345d2c1de2..41e79e3870 100644 --- a/backend/src/grpc_server.h +++ b/backend/src/grpc_server.h @@ -15,13 +15,8 @@ #include "mission/mission_service_impl.h" #include "telemetry/telemetry_service_impl.h" #include "info/info_service_impl.h" -<<<<<<< HEAD -======= -#include "plugins/param/param.h" -#include "param/param_service_impl.h" #include "plugins/gimbal/gimbal.h" #include "gimbal/gimbal_service_impl.h" ->>>>>>> 58e4c1a... Add gimbal support to the SDK. namespace dronecode_sdk { namespace backend {