ascribe
/
onion
mirror of https://github.com/ascribe/onion.git
1
0
Fork 0
Code Issues Releases Wiki Activity

resolving merge conflict #2

This commit is contained in:
Tim Daubenschütz 2015-05-15 15:27:23 +02:00
parent f96ec92df6
commit 2b8f46cb8c
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
package.json
View File

@ -4,13 +4,8 @@
"description": "Das neue web client for Ascribe",
"main": "js/app.js",
"scripts": {
<<<<<<< HEAD
"start": "watchify -o js/bundle.js -v -d js/app.js",
"build": "browserify . -t [envify --NODE_ENV production] | uglifyjs -cm > js/bundle.min.js",
=======
"watch": "watchify -o build/app.js -v -d js/app.js",
"build": "browserify . -t [envify --NODE_ENV production] | uglifyjs -cm > build/app.js",
>>>>>>> b000ecd925e2e23febd47b088384cf6d5d155a9c
"test": "jest"
},
"author": "Ascribe",