Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into dev
Browse files Browse the repository at this point in the history
# Conflicts:
#	yarn.lock
  • Loading branch information
Asherda committed Feb 10, 2024
2 parents a73456a + f0b179e commit 54a481c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion package.json
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@
"node-fetch": "2.6.7",
"react-test-renderer": "17.0.1",
"rn-nodeify": "github:tradle/rn-nodeify",
"snyk": "1.996.0"
"snyk": "1.1064.0"
},
"resolutions": {
"word-wrap": "1.2.4",
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -10561,10 +10561,10 @@ snapdragon@^0.8.1:
source-map-resolve "^0.5.0"
use "^3.1.0"

snyk@1.996.0:
version "1.996.0"
resolved "https://registry.yarnpkg.com/snyk/-/snyk-1.996.0.tgz#0369ca9e6a3a148751294c1320f59a79d5eb3c88"
integrity sha512-nq//Ely0bSt50LzX9Er5lCQNqTpaKn7I7xkhUB3Z+8rs8Jqha360HeQwhbVzsuQS3xT/1+36zt6CcgyLPM1QbA==
snyk@1.1064.0:
version "1.1064.0"
resolved "https://registry.yarnpkg.com/snyk/-/snyk-1.1064.0.tgz#e73b3a1aff585f6266f73ddd498c5cfd5e67aff0"
integrity sha512-f9mNO5rUc5nVVZ1sN+do2i5/RGHKlOQoNk5HiEO9WkPEn2pFllJv2XAw5Bn7sFj1eLXNFVUOUlo6SVqGnX7lXw==

socks-proxy-agent@^6.0.0:
version "6.2.1"
Expand Down

0 comments on commit 54a481c

Please sign in to comment.