wbrawner/piskel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix package.json

Browse source
This commit is contained in:
Dávid Szabó 2016-08-31 17:25:20 +02:00
parent e7ed2f9b24
commit 3b65b90de1
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
package.json
View file

@ -51,12 +51,8 @@
"karma-jasmine": "1.0.2",
"karma-phantomjs-launcher": "0.2.3",
"load-grunt-tasks": "3.5.0",
<<<<<<< HEAD
"phantomjs": "1.9.19",
"phantomjs": "2.1.7",
"phantomjs-polyfill-object-assign": "0.0.2"
=======
"phantomjs": "2.1.7"
>>>>>>> adee70c... Update phantomjs to 2.1.7
},
"window": {
"title": "Piskel",