From 75c15d5d0bce47e4d735445a8a5df70ca162bfa4 Mon Sep 17 00:00:00 2001
From: deadprogram <ron@hybridgroup.com>
Date: Fri, 26 Mar 2021 18:28:12 +0100
Subject: [PATCH] build: correct error in Makefile from invalid merge

Signed-off-by: deadprogram <ron@hybridgroup.com>
---
 Makefile | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Makefile b/Makefile
index 1f694e1..f073712 100644
--- a/Makefile
+++ b/Makefile
@@ -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: