FIX merge problem ver 1.4.0

askuric · askuric · commit 683177fb3910 · 2020-07-29T23:28:42.000+02:00
diff --git a/library.properties b/library.properties
@@ -1,9 +1,5 @@
 name=Simple FOC
-<<<<<<< HEAD
-version=1.3.1
-=======
 version=1.4.0
->>>>>>> dev
 author=Antun Skuric <antun.skuric@outlook.com>
 maintainer=Antun Skuric <antun.skuric@outlook.com>
 sentence=A library demistifying FOC for BLDC motors
