Merge branch 'master' of https://github.com/siminchikkunarayku/Tapirchip

# Conflicts: # README.md
siminchikkunarayku · Apr 1, 2019 · 282e3f6e3ce4598dfee975e441049dbb8c4a1861 · 282e3f6
2 parents d046325 + 2566a80
commit 282e3f6e3ce4598dfee975e441049dbb8c4a1861
Unified Split

Showing with 4 additions and 0 deletions.

+4 −0 README.md
diff --git a/README.md b/README.md
@@ -6,7 +6,11 @@ PROJECT TAPIRCHIP
 </p>
 <p align="center">
+  
+<<<<<<< HEAD
 [![Watch the video!] [(https://img.youtube.com/vi/K2XoNLCk-Mk/maxresdefault.jpg)] (https://youtu.be/K2XoNLCk-Mk)
+  
+=======
+  
+[![Watch the video!] (https://img.youtube.com/vi/K2XoNLCk-Mk/maxresdefault.jpg)] (https://youtu.be/K2XoNLCk-Mk)
+  
+>>>>>>> 2566a802ba2df93a2157bbe6df32cbea7a70422f
 </p>
 INTRODUCTION