From 0e7c183cd05d981c6350d9487f93b8e3d3cba15c Mon Sep 17 00:00:00 2001
From: Nathan Kunicki <nathank@mediamolecule.com>
Date: Thu, 5 Jul 2018 10:20:27 +0100
Subject: [PATCH] Added to readme

---
 ABOUT.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/ABOUT.md b/ABOUT.md
index 5da516e..2ade2e3 100644
--- a/ABOUT.md
+++ b/ABOUT.md
@@ -24,11 +24,7 @@ While most LPF2 components and Hubs are compatible with each other, there are ex
 | Boost Color and Distance Sensor | Sensor        |     *Partial (<a href="#compatibility-note-1">1</a>)*    |       Yes      |       Yes      | <a href="https://brickset.com/sets/17101-1/">17101</a> |
 | Boost Interactive Motor  | Motor/Sensor  |     *Partial (<a href="#compatibility-note-2">2</a>)*    |       Yes      |       Yes      | <a href="https://brickset.com/sets/17101-1/">17101</a> |
 | Powered Up Train Motor          | Motor         |         No         |       Yes      |       Yes      | <a href="https://brickset.com/sets/60197-1/">60197</a><br /><a href="https://brickset.com/sets/60198-1/">60198</a> |
-<<<<<<< HEAD
-| Powered Up LED Lights           | Lights        |       Unknown      |     Unknown    |     Unknown    | <a href="https://brickset.com/sets/88005-1/">88005</a> |
-=======
 | Powered Up LED Lights           | Light         |       Unknown      |     Unknown    |     Unknown    | <a href="https://brickset.com/sets/88005-1/">88005</a> |
->>>>>>> 4988da178b8c48d2c76a5f026c750cf727f5f5f5
 
 <a name="compatibility-note-1"></a><sub>(1) Only color mode is supported on the WeDo 2.0 Smart Hub at this point.</sub>