From d2626d725d8f855aac9ee90611c97c1335f0bf77 Mon Sep 17 00:00:00 2001
From: Carlo Wood <carlo@alinoe.com>
Date: Tue, 13 Sep 2016 13:40:35 +0200
Subject: [PATCH] Makefile cleanup - fix merge conflict change

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 728426eb4b..c7b3651b5d 100644
--- a/Makefile
+++ b/Makefile
@@ -158,7 +158,7 @@ nuttx_% posix_% qurt_%:
 # Abbreviated config targets.
 
 # nuttx_ is left off by default.
-tap-% asc-% px4fmu-% px4-% mindpx-% crazyflie_default:
+tap-% asc-% px4fmu-% px4-% mindpx-% crazyflie_%:
 	$(call cmake-build,nuttx_$@)
 
 posix: posix_sitl_default