gabehf/sqm-dashboards
1
0
Fork 0
mirror of https://github.com/edcommonwealth/sqm-dashboards.git synced 2026-03-07 21:48:16 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: merge conflicts in yarn.lock file broke deployments. Corrected merge conflicts

Browse source
This commit is contained in:
Nelson Jovel 2023-06-28 21:20:46 -07:00
parent 11948f23ac
commit 4c2e3511f0
1 changed files with 0 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
yarn.lock
View file

@ -3971,19 +3971,12 @@ saxes@^5.0.1:
dependencies:
xmlchars "^2.2.0"
<<<<<<< HEAD
semver@7.0.0:
version "7.0.0"
resolved "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz"
integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
=======
semver@7.5.2:
version "7.5.2"
resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.2.tgz#5b851e66d1be07c1cdaf37dfc856f543325a2beb"
integrity sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==
dependencies:
lru-cache "^6.0.0"
>>>>>>> eaef648 (upgraded semver to 7.5.2 and adding updated files package.json and yarn.lock)
semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0:
version "6.3.0"