From e3572a7f4e134fe286b762d4d87e67731a0807bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= Date: Mon, 30 Aug 2021 11:30:37 +0200 Subject: [PATCH] oops MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Fredrik Adelöw --- plugins/cloudbuild/package.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/plugins/cloudbuild/package.json b/plugins/cloudbuild/package.json index dd15d257f6..41feeee2da 100644 --- a/plugins/cloudbuild/package.json +++ b/plugins/cloudbuild/package.json @@ -42,12 +42,8 @@ "qs": "^6.9.4", "react": "^16.13.1", "react-dom": "^16.13.1", -<<<<<<< HEAD:plugins/cloudbuild/package.json "react-hook-form": "^7.12.2", "react-lazylog": "^4.5.3", -======= - "react-hook-form": "^6.15.4", ->>>>>>> chore: reset register component as it's going away in another PR:plugins/register-component/package.json "react-router": "6.0.0-beta.0", "react-router-dom": "6.0.0-beta.0", "react-use": "^17.2.4"