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

CoorFun · Dec 26, 2018 · 4ac17d3 · 4ac17d3
2 parents 9bab91f + 3557d68
commit 4ac17d3
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -4,10 +4,14 @@ 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