mirror of
https://github.com/piskelapp/piskel.git
synced 2023-08-10 21:12:52 +03:00
Update phantomjs to 2.1.7
PhantomJS 1.9.19 doesn't support typed arrays so the tests would fail.
This commit is contained in:
parent
0238dffe71
commit
e7ed2f9b24
@ -51,8 +51,12 @@
|
|||||||
"karma-jasmine": "1.0.2",
|
"karma-jasmine": "1.0.2",
|
||||||
"karma-phantomjs-launcher": "0.2.3",
|
"karma-phantomjs-launcher": "0.2.3",
|
||||||
"load-grunt-tasks": "3.5.0",
|
"load-grunt-tasks": "3.5.0",
|
||||||
|
<<<<<<< HEAD
|
||||||
"phantomjs": "1.9.19",
|
"phantomjs": "1.9.19",
|
||||||
"phantomjs-polyfill-object-assign": "0.0.2"
|
"phantomjs-polyfill-object-assign": "0.0.2"
|
||||||
|
=======
|
||||||
|
"phantomjs": "2.1.7"
|
||||||
|
>>>>>>> adee70c... Update phantomjs to 2.1.7
|
||||||
},
|
},
|
||||||
"window": {
|
"window": {
|
||||||
"title": "Piskel",
|
"title": "Piskel",
|
||||||
|
Loading…
Reference in New Issue
Block a user