edit package.json

bikenik · Jun 1, 2020 · cebe642 · cebe642
1 parent b599c97
commit cebe642
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -1,12 +1,6 @@
 {
 	"name": "alfred-lingualeo",
-<<<<<<< HEAD
-	"version": "1.4.0",
-||||||| merged common ancestors
-	"version": "1.3.1",
-=======
 	"version": "1.4.1",
->>>>>>> Hotfix
 	"description": "lingualeo dictionary",
 	"license": "MIT",
 	"repository": "bikenik/alfred-lingualeo",