AverageMarcus/milligram
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into develop

Browse Source 
# Conflicts:
#	package.json
This commit is contained in:
CJ Patoilo 2016-10-07 15:34:16 -03:00
commit cd39551a17
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -70,6 +70,6 @@
"start": "run-p watch serve", "start": "run-p watch serve",
"reference": "cd node_modules/backstopjs && npm run reference -- --configPath=../../test/visual/backstop.config.js && cd ../../", "reference": "cd node_modules/backstopjs && npm run reference -- --configPath=../../test/visual/backstop.config.js && cd ../../",
"compare": "cd node_modules/backstopjs && npm run test -- --configPath=../../test/visual/backstop.config.js && cd ../../", "compare": "cd node_modules/backstopjs && npm run test -- --configPath=../../test/visual/backstop.config.js && cd ../../",
"test": "npm run lint" "test": "run-s build"
} }
} }