cupcakearmy/svelte-i18n
1
0
Fork 0
mirror of https://github.com/cupcakearmy/svelte-i18n.git synced 2024-09-28 15:14:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: 🐛 fix conflict artifacts

Browse Source
This commit is contained in:
Christian Kaisermann 2019-11-29 22:56:40 -03:00
parent 7ff154cc44
commit feb7ab9dea
1 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
package.json
View File

@ -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": {
@ -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",
@ -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/"