david.tahir/AngularTicTacToe
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merge conflict

Browse Source
This commit is contained in:
Maxime GRIS
2018-02-25 22:12:16 +01:00
parent 67ab31c458 16d2548b99
commit ce5724c11f
6 changed files with 37 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
package.json
View File

@@ -59,16 +59,16 @@
"cross-env": "5.0.5",
"dotenv": "5.0.0",
"electron": "1.8.2",
"electron-builder": "20.0.4",
"electron-builder": "20.0.5",
"electron-reload": "1.2.2",
"enhanced-resolve": "3.3.0",
"fs-extra": "5.0.0",
"jasmine-core": "2.8.0",
"jasmine-core": "2.99.1",
"jasmine-spec-reporter": "4.2.1",
"karma": "2.0.0",
"karma-chrome-launcher": "2.2.0",
"karma-coverage-istanbul-reporter": "1.2.1",
"karma-jasmine": "1.1.0",
"karma-coverage-istanbul-reporter": "1.4.1",
"karma-jasmine": "1.1.1",
"karma-jasmine-html-reporter": "0.2.2",
"npm-run-all": "4.1.2",
"npx": "9.7.1",