Merge branch 'master' of https://github.com/CoorFun/cAPA102

CoorFun · Dec 29, 2018 · d24572b · d24572b
2 parents 6addd5f + a264146
commit d24572b
Showing 1 changed file with 1 addition and 5 deletions.
diff --git 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
+- [x] Defined API