merge develop v0.2.1

codermarcos · May 20, 2018 · 1eda4b1 · 1eda4b1
1 parent 6ee3333
commit 1eda4b1
Showing 1 changed file with 0 additions and 4 deletions.
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": {