From 56ea2f047ca042a74bc8949d48765a42535c7e36 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Tue, 12 Nov 2019 11:09:13 +0100
Subject: [PATCH] [wip/talos-dev] fix merge

---
 talos-dev/Makefile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/talos-dev/Makefile b/talos-dev/Makefile
index e0098c7c..dadf2b75 100644
--- a/talos-dev/Makefile
+++ b/talos-dev/Makefile
@@ -13,7 +13,6 @@ META_PACKAGE=	yes
 include ../../interfaces/humanoid-nav-msgs/depend.mk
 include ../../wip/py-sot-talos/depend.mk
 include ../../wip/prf-gazebo-ros-pkgs/depend.mk
-include ../../wip/sot-talos/depend.mk
 include ../../wip/talos-metapkg-ros-control-sot/depend.mk
 include ../../wip/talos-simulation/depend.mk
 include ../../mk/robotpkg.mk
-- 
GitLab