From dbd27f4649b669ded118b0ba52f86d035edc5740 Mon Sep 17 00:00:00 2001
From: Tinyu <Tinyu.Zhao@gmail.com>
Date: Sat, 12 Mar 2022 21:15:01 +0800
Subject: [PATCH] 0.1.2

---
 library.properties | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/library.properties b/library.properties
index c187d4cb..93b607a3 100644
--- 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