build: correct error in Makefile from invalid merge

Signed-off-by: deadprogram <ron@hybridgroup.com>
This commit is contained in:
deadprogram
2021-03-26 18:28:12 +01:00
parent e1deb45aac
commit 75c15d5d0b
-4
View File
@@ -175,11 +175,7 @@ endif
DRIVERS = $(wildcard */)
NOTESTS = build examples flash semihosting pcd8544 shiftregister st7789 microphone mcp3008 gps microbitmatrix \
hcsr04 ssd1331 ws2812 thermistor apa102 easystepper ssd1351 ili9341 wifinina shifter hub75 \
<<<<<<< HEAD
hd44780 buzzer ssd1306 espat l9110x st7735 bmi160 l293x dht keypad4x4 max72xx
=======
hd44780 buzzer ssd1306 espat l9110x st7735 bmi160 l293x dht keypad4x4
>>>>>>> add 4x4 keypad driver (#226)
TESTS = $(filter-out $(addsuffix /%,$(NOTESTS)),$(DRIVERS))
unit-test: