From a967745fcdc229996e8f1fb22ca568a7e9dcb705 Mon Sep 17 00:00:00 2001 From: Lachlan Miller Date: Wed, 20 Oct 2021 18:36:37 +1000 Subject: [PATCH] merge conflicts --- packages/server/package.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 911e650efd..3cca5d98ed 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -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",