Skip to content

Commit

Permalink
update lock to yarn v2
Browse files Browse the repository at this point in the history
  • Loading branch information
dgerrellsMagic committed Sep 17, 2021
1 parent f049e42 commit 9518b6e
Showing 1 changed file with 7 additions and 32 deletions.
39 changes: 7 additions & 32 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4118,32 +4118,19 @@ __metadata:
languageName: node
linkType: hard

<<<<<<< HEAD
"@magic-sdk/commons@^2.0.4, @magic-sdk/commons@workspace:packages/@magic-sdk/commons":
"@magic-sdk/commons@^2.0.5, @magic-sdk/commons@workspace:packages/@magic-sdk/commons":
version: 0.0.0-use.local
resolution: "@magic-sdk/commons@workspace:packages/@magic-sdk/commons"
dependencies:
"@magic-sdk/provider": ^6.0.4
"@magic-sdk/provider": ^6.0.5
"@magic-sdk/types": ^5.0.2
=======
"@magic-sdk/commons@^2.0.3, @magic-sdk/commons@workspace:packages/@magic-sdk/commons":
version: 0.0.0-use.local
resolution: "@magic-sdk/commons@workspace:packages/@magic-sdk/commons"
dependencies:
"@magic-sdk/provider": ^6.0.3
"@magic-sdk/types": ^5.0.1
>>>>>>> update yarn lock file
peerDependencies:
"@magic-sdk/provider": ">=4.3.0"
"@magic-sdk/types": ">=3.1.1"
languageName: unknown
linkType: soft

<<<<<<< HEAD
"@magic-sdk/provider@^6.0.4, @magic-sdk/provider@workspace:packages/@magic-sdk/provider":
=======
"@magic-sdk/provider@^6.0.3, @magic-sdk/provider@workspace:packages/@magic-sdk/provider":
>>>>>>> update yarn lock file
"@magic-sdk/provider@^6.0.5, @magic-sdk/provider@workspace:packages/@magic-sdk/provider":
version: 0.0.0-use.local
resolution: "@magic-sdk/provider@workspace:packages/@magic-sdk/provider"
dependencies:
Expand All @@ -4168,15 +4155,9 @@ __metadata:
"@babel/core": ^7.15.0
"@babel/plugin-transform-flow-strip-types": ^7.14.5
"@babel/runtime": ~7.10.4
<<<<<<< HEAD
"@magic-sdk/commons": ^2.0.4
"@magic-sdk/provider": ^6.0.4
"@magic-sdk/commons": ^2.0.5
"@magic-sdk/provider": ^6.0.5
"@magic-sdk/types": ^5.0.2
=======
"@magic-sdk/commons": ^2.0.3
"@magic-sdk/provider": ^6.0.3
"@magic-sdk/types": ^5.0.1
>>>>>>> update yarn lock file
"@react-native-async-storage/async-storage": ^1.15.5
"@types/lodash": ^4.14.158
buffer: ~5.6.0
Expand Down Expand Up @@ -13765,15 +13746,9 @@ fsevents@^1.2.7:
"@babel/core": ^7.9.6
"@babel/plugin-proposal-optional-chaining": ^7.9.0
"@babel/runtime": ^7.9.6
<<<<<<< HEAD
"@magic-sdk/commons": ^2.0.4
"@magic-sdk/provider": ^6.0.4
"@magic-sdk/commons": ^2.0.5
"@magic-sdk/provider": ^6.0.5
"@magic-sdk/types": ^5.0.2
=======
"@magic-sdk/commons": ^2.0.3
"@magic-sdk/provider": ^6.0.3
"@magic-sdk/types": ^5.0.1
>>>>>>> update yarn lock file
localforage: ^1.7.4
localforage-driver-memory: ^1.0.5
languageName: unknown
Expand Down

0 comments on commit 9518b6e

Please sign in to comment.