mirror/cypress
1
0
Fork 0
mirror of https://github.com/cypress-io/cypress.git synced 2026-02-09 08:40:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

merge conflicts

Browse Source
This commit is contained in:
Lachlan Miller
2021-10-20 18:36:37 +10:00
parent 5754b2c480
commit a967745fcd
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/server/package.json
View File

@@ -148,11 +148,8 @@
"@packages/root": "0.0.0-development",
"@packages/socket": "0.0.0-development",
"@packages/ts": "0.0.0-development",
<<<<<<< HEAD
"@packages/types": "0.0.0-development",
=======
"@tooling/system-tests": "0.0.0-development",
>>>>>>> develop
"@types/chai-as-promised": "7.1.2",
"@types/chrome": "0.0.101",
"@types/http-proxy": "1.17.4",