Skip to content

Commit

Permalink
fix: πŸ› fix conflict artifacts
Browse files Browse the repository at this point in the history
  • Loading branch information
kaisermann committed Dec 2, 2019
1 parent 7ff154c commit feb7ab9
Showing 1 changed file with 0 additions and 13 deletions.
13 changes: 0 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
{
"name": "svelte-i18n",
<<<<<<< HEAD
"version": "2.1.0",
=======
"version": "1.1.2",
>>>>>>> master
"main": "dist/i18n.js",
"module": "dist/i18n.mjs",
"bin": {
Expand All @@ -28,7 +24,6 @@
"build": "rollup -c",
"dev": "rollup -c -w",
"pretest": "npm run build",
<<<<<<< HEAD
"test": "jest",
"test:ci": "jest --silent",
"test:watch": "jest --verbose --watchAll",
Expand All @@ -38,14 +33,6 @@
"release": " git add package.json && git commit -m \"chore(release): v$npm_package_version :tada:\"",
"postrelease": "git tag -a v$npm_package_version -m 'Release v$npm_package_version'",
"prepublishOnly": "run-s test:ci build release"
=======
"test": "jest --no-cache --verbose",
"test:watch": "jest --no-cache --verbose --watchAll",
"test:ci": "jest --no-cache --silent",
"lint": "eslint \"src/**/*.js\"",
"format": "prettier --loglevel silent --write \"src/**/*.js\" && eslint --fix \"src/**/*.js\"",
"prepublishOnly": "npm run format && npm run test && npm run build"
>>>>>>> master
},
"files": [
"dist/"
Expand Down

0 comments on commit feb7ab9

Please sign in to comment.