merge develop v0.2.1

codermarcos · codermarcos · commit 1eda4b131352 · 2018-05-20T02:44:17.000-03:00
diff --git a/package.json b/package.json
@@ -1,10 +1,6 @@
 {
   "name": "simple-mask-money",
-<<<<<<< HEAD
   "version": "0.2.0",
-=======
-  "version": "0.1.2",
->>>>>>> d9c132a17b324ce70d746c4e465485a33a48a6f0
   "description": "Simple money mask developed with pure JavaScript",
   "main": "lib/simple-mask-money.js",
   "scripts": {
