From a264146bf5000dcaa8f6c6ce719a435a20ba3434 Mon Sep 17 00:00:00 2001
From: Coor <coorfang@gmail.com>
Date: Wed, 26 Dec 2018 23:40:56 +0100
Subject: [PATCH] update

---
 README.md | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 535e4a3..459f2b2 100644
--- a/README.md
+++ b/README.md
@@ -4,16 +4,12 @@ cAPA102 is a lightweight hardware SPI based APA102 library, fast and easy to use
 
 This library is targeting to Raspberry Pi, ReSpeaker Core V2, Beaglebone such platforms.
 
-<<<<<<< HEAD
 # Estimated Available Time
 
 ***Middle of January of 2019***
 
-=======
-# Estimated Available
->>>>>>> 3557d68e428cb67dab18a80f5c85289c90ddc7ab
 # Working Progress
 
 Dec, 26, 2018
 
-- [x] Defined API
\ No newline at end of file
+- [x] Defined API