Skip to content

Commit f5e3c61

Browse files
Harrison IfeanyichukwuHarrison Ifeanyichukwu
authored andcommitted
fix: fix dependencies
1 parent fbcd8e2 commit f5e3c61

1 file changed

Lines changed: 11 additions & 59 deletions

File tree

yarn.lock

Lines changed: 11 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -3967,18 +3967,7 @@ debug@^3.1.0, debug@^3.2.6:
39673967
dependencies:
39683968
ms "^2.1.1"
39693969

3970-
<<<<<<< HEAD
3971-
debuglog@^1.0.1:
3972-
=======
3973-
debug@^4.0.0, debug@^4.1.0, debug@^4.1.1:
3974-
version "4.1.1"
3975-
resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
3976-
integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
3977-
dependencies:
3978-
ms "^2.1.1"
3979-
39803970
debuglog@*, debuglog@^1.0.1:
3981-
>>>>>>> 0af86824754dc653ab69b98215873bef399a1bf4
39823971
version "1.0.1"
39833972
resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
39843973
integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI=
@@ -5042,22 +5031,15 @@ has-flag@^3.0.0:
50425031
resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
50435032
integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
50445033

5045-
<<<<<<< HEAD
50465034
has-flag@^4.0.0:
50475035
version "4.0.0"
50485036
resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
50495037
integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
50505038

5051-
has-symbols@^1.0.0:
5052-
version "1.0.0"
5053-
resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz#ba1a8f1af2a0fc39650f5c850367704122063b44"
5054-
integrity sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=
5055-
=======
50565039
has-symbols@^1.0.0, has-symbols@^1.0.1:
50575040
version "1.0.1"
50585041
resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8"
50595042
integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==
5060-
>>>>>>> 0af86824754dc653ab69b98215873bef399a1bf4
50615043

50625044
has-unicode@^2.0.0, has-unicode@~2.0.1:
50635045
version "2.0.1"
@@ -5182,15 +5164,14 @@ http-signature@~1.2.0:
51825164
jsprim "^1.2.2"
51835165
sshpk "^1.7.0"
51845166

5185-
https-proxy-agent@^2.2.1:
5186-
version "2.2.2"
5187-
resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.2.tgz#271ea8e90f836ac9f119daccd39c19ff7dfb0793"
5188-
integrity sha512-c8Ndjc9Bkpfx/vCJueCPy0jlP4ccCCSNDp8xwCZzPjKJUm+B+u9WX2x98Qx4n1PiMNTWo3D7KK5ifNV/yJyRzg==
5167+
https-proxy-agent@^2.2.3:
5168+
version "2.2.4"
5169+
resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz#4ee7a737abd92678a293d9b34a1af4d0d08c787b"
5170+
integrity sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==
51895171
dependencies:
51905172
agent-base "^4.3.0"
51915173
debug "^3.1.0"
51925174

5193-
<<<<<<< HEAD
51945175
https-proxy-agent@^5.0.0:
51955176
version "5.0.0"
51965177
resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2"
@@ -5203,15 +5184,6 @@ human-signals@^1.1.1:
52035184
version "1.1.1"
52045185
resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
52055186
integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==
5206-
=======
5207-
https-proxy-agent@^2.2.3:
5208-
version "2.2.4"
5209-
resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz#4ee7a737abd92678a293d9b34a1af4d0d08c787b"
5210-
integrity sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==
5211-
dependencies:
5212-
agent-base "^4.3.0"
5213-
debug "^3.1.0"
5214-
>>>>>>> 0af86824754dc653ab69b98215873bef399a1bf4
52155187

52165188
humanize-ms@^1.2.1:
52175189
version "1.2.1"
@@ -6657,19 +6629,11 @@ lodash.map@^4.5.1:
66576629
resolved "https://registry.yarnpkg.com/lodash.map/-/lodash.map-4.6.0.tgz#771ec7839e3473d9c4cde28b19394c3562f4f6d3"
66586630
integrity sha1-dx7Hg540c9nEzeKLGTlMNWL09tM=
66596631

6660-
<<<<<<< HEAD
6661-
=======
66626632
lodash.restparam@*:
66636633
version "3.6.1"
66646634
resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805"
66656635
integrity sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=
66666636

6667-
lodash.set@^4.3.2:
6668-
version "4.3.2"
6669-
resolved "https://registry.yarnpkg.com/lodash.set/-/lodash.set-4.3.2.tgz#d8757b1da807dde24816b0d6a84bea1a76230b23"
6670-
integrity sha1-2HV7HagH3eJIFrDWqEvqGnYjCyM=
6671-
6672-
>>>>>>> 0af86824754dc653ab69b98215873bef399a1bf4
66736637
lodash.sortby@^4.7.0:
66746638
version "4.7.0"
66756639
resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
@@ -7529,7 +7493,6 @@ npm@^6.0.0, npm@^6.10.3:
75297493
cmd-shim "^3.0.3"
75307494
columnify "~1.5.4"
75317495
config-chain "^1.1.12"
7532-
debuglog "*"
75337496
detect-indent "~5.0.0"
75347497
detect-newline "^2.1.0"
75357498
dezalgo "~1.0.3"
@@ -7544,7 +7507,6 @@ npm@^6.0.0, npm@^6.10.3:
75447507
has-unicode "~2.0.1"
75457508
hosted-git-info "^2.8.5"
75467509
iferr "^1.0.2"
7547-
imurmurhash "*"
75487510
infer-owner "^1.0.4"
75497511
inflight "~1.0.6"
75507512
inherits "^2.0.4"
@@ -7563,14 +7525,8 @@ npm@^6.0.0, npm@^6.10.3:
75637525
libnpx "^10.2.0"
75647526
lock-verify "^2.1.0"
75657527
lockfile "^1.0.4"
7566-
lodash._baseindexof "*"
75677528
lodash._baseuniq "~4.6.0"
7568-
lodash._bindcallback "*"
7569-
lodash._cacheindexof "*"
7570-
lodash._createcache "*"
7571-
lodash._getnative "*"
75727529
lodash.clonedeep "~4.5.0"
7573-
lodash.restparam "*"
75747530
lodash.union "~4.6.0"
75757531
lodash.uniq "~4.5.0"
75767532
lodash.without "~4.4.0"
@@ -8771,17 +8727,17 @@ resolve@^1.1.6, resolve@^1.3.2, resolve@^1.8.1:
87718727
dependencies:
87728728
path-parse "^1.0.6"
87738729

8774-
<<<<<<< HEAD
8775-
resolve@^1.11.0, resolve@^1.11.1:
8776-
version "1.15.1"
8777-
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.15.1.tgz#27bdcdeffeaf2d6244b95bb0f9f4b4653451f3e8"
8778-
integrity sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w==
8779-
=======
87808730
resolve@^1.10.0:
87818731
version "1.13.1"
87828732
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.13.1.tgz#be0aa4c06acd53083505abb35f4d66932ab35d16"
87838733
integrity sha512-CxqObCX8K8YtAhOBRg+lrcdn+LK+WYOS8tSjqSFbjtrI5PnS63QPhZl4+yKfrU9tdsbMu9Anr/amegT87M9Z6w==
8784-
>>>>>>> 0af86824754dc653ab69b98215873bef399a1bf4
8734+
dependencies:
8735+
path-parse "^1.0.6"
8736+
8737+
resolve@^1.11.0, resolve@^1.11.1:
8738+
version "1.15.1"
8739+
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.15.1.tgz#27bdcdeffeaf2d6244b95bb0f9f4b4653451f3e8"
8740+
integrity sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w==
87858741
dependencies:
87868742
path-parse "^1.0.6"
87878743

@@ -9591,7 +9547,6 @@ string-width@^4.1.0:
95919547
is-fullwidth-code-point "^3.0.0"
95929548
strip-ansi "^5.2.0"
95939549

9594-
<<<<<<< HEAD
95959550
string-width@^4.2.0:
95969551
version "4.2.0"
95979552
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5"
@@ -9601,10 +9556,7 @@ string-width@^4.2.0:
96019556
is-fullwidth-code-point "^3.0.0"
96029557
strip-ansi "^6.0.0"
96039558

9604-
string.prototype.trimleft@^2.0.0:
9605-
=======
96069559
string.prototype.trimleft@^2.1.0:
9607-
>>>>>>> 0af86824754dc653ab69b98215873bef399a1bf4
96089560
version "2.1.0"
96099561
resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz#6cc47f0d7eb8d62b0f3701611715a3954591d634"
96109562
integrity sha512-FJ6b7EgdKxxbDxc79cOlok6Afd++TTs5szo+zJTUyow3ycrRfJVE2pq3vcN53XexvKZu/DJMDfeI/qMiZTrjTw==

0 commit comments

Comments
 (0)