0.1.2

TinyuZhao · TinyuZhao · commit dbd27f4649b6 · 2022-03-12T21:15:01.000+08:00
diff --git a/library.properties b/library.properties
@@ -1,9 +1,5 @@
 name=M5Core2
-<<<<<<< HEAD
 version=0.1.2
-=======
-version=0.1.1
->>>>>>> 7440195292b67f4cccf419bcae0a58f5749500ec
 author=M5Stack
 maintainer=M5Stack
 sentence=Library for M5Stack Core2 development kit
