Resolve merge conflicts.

mavlink · Mar 4, 2019 · 2a62cf3 · 2a62cf3
1 parent 7a2384f
commit 2a62cf3
Showing 1 changed file with 0 additions and 5 deletions.
diff --git 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 {