From 853e5cff7d4740336b3edc0487acb9bfd9aabbfc Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Wed, 31 May 2023 19:01:47 +0100
Subject: [PATCH] PR Feedback fix

---
 yarn.lock | 71 -------------------------------------------------------
 1 file changed, 71 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index aec4aade4d..cc5dd19f50 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3609,75 +3609,6 @@
     validate-npm-package-name "^4.0.0"
     yargs-parser "20.2.4"
 
-<<<<<<< HEAD
-"@lerna/legacy-package-management@6.6.1":
-  version "6.6.1"
-  resolved "https://registry.yarnpkg.com/@lerna/legacy-package-management/-/legacy-package-management-6.6.1.tgz#1f44af40098b9396a4f698514ff2b87016b1ee3d"
-  integrity sha512-0EYxSFr34VgeudA5rvjGJSY7s4seITMVB7AJ9LRFv9QDUk6jpvapV13ZAaKnhDTxX5vNCfnJuWHXXWq0KyPF/Q==
-  dependencies:
-    "@npmcli/arborist" "6.2.3"
-    "@npmcli/run-script" "4.1.7"
-    "@nrwl/devkit" ">=15.5.2 < 16"
-    "@octokit/rest" "19.0.3"
-    byte-size "7.0.0"
-    chalk "4.1.0"
-    clone-deep "4.0.1"
-    cmd-shim "5.0.0"
-    columnify "1.6.0"
-    config-chain "1.1.12"
-    conventional-changelog-core "4.2.4"
-    conventional-recommended-bump "6.1.0"
-    cosmiconfig "7.0.0"
-    dedent "0.7.0"
-    dot-prop "6.0.1"
-    execa "5.0.0"
-    file-url "3.0.0"
-    find-up "5.0.0"
-    fs-extra "9.1.0"
-    get-port "5.1.1"
-    get-stream "6.0.0"
-    git-url-parse "13.1.0"
-    glob-parent "5.1.2"
-    globby "11.1.0"
-    graceful-fs "4.2.10"
-    has-unicode "2.0.1"
-    inquirer "8.2.4"
-    is-ci "2.0.0"
-    is-stream "2.0.0"
-    libnpmpublish "6.0.4"
-    load-json-file "6.2.0"
-    make-dir "3.1.0"
-    minimatch "3.0.5"
-    multimatch "5.0.0"
-    node-fetch "2.6.7"
-    npm-package-arg "8.1.1"
-    npm-packlist "5.1.1"
-    npm-registry-fetch "14.0.3"
-    npmlog "6.0.2"
-    p-map "4.0.0"
-    p-map-series "2.1.0"
-    p-queue "6.6.2"
-    p-waterfall "2.1.1"
-    pacote "13.6.2"
-    pify "5.0.0"
-    pretty-format "29.4.3"
-    read-cmd-shim "3.0.0"
-    read-package-json "5.0.1"
-    resolve-from "5.0.0"
-    semver "7.3.8"
-    signal-exit "3.0.7"
-    slash "3.0.0"
-    ssri "9.0.1"
-    strong-log-transformer "2.1.0"
-    tar "6.1.11"
-    temp-dir "1.0.0"
-    tempy "1.0.0"
-    upath "2.0.1"
-    uuid "8.3.2"
-    write-file-atomic "4.0.1"
-    write-pkg "4.0.0"
-    yargs "16.2.0"
-
 "@lezer/common@^1.0.0":
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/@lezer/common/-/common-1.0.2.tgz#8fb9b86bdaa2ece57e7d59e5ffbcb37d71815087"
@@ -3705,8 +3636,6 @@
   dependencies:
     "@lezer/common" "^1.0.0"
 
-=======
->>>>>>> origin/develop
 "@mapbox/node-pre-gyp@^1.0.0":
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.10.tgz#8e6735ccebbb1581e5a7e652244cadc8a844d03c"