diff options
Diffstat (limited to 'yarn.lock')
| -rw-r--r-- | yarn.lock | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -7362,6 +7362,7 @@ dependencies: "@babel/plugin-transform-object-assign" "^7.10.4" <<<<<<< HEAD +<<<<<<< HEAD fbjs "^3.0.0" string-hash-64 "^1.0.3" @@ -7412,6 +7413,8 @@ react-native-svg-transformer@^0.14.3: resolved "https://registry.yarnpkg.com/react-native-svg-transformer/-/react-native-svg-transformer-0.14.3.tgz#43c8e176f5a11f16f39b87a64018e0ac090ffbdb" integrity sha512-agDGdMeeBAsWEgg/u7mjtR2Z3c8smGCLep/n3svwifut9dpswZCP+bSIrU8ekg6RNtxAJL+eGJbWjJ38vWxw6g== ======= +======= +>>>>>>> 657bfed7 (Fixed yarn file.) "fbjs" "^3.0.0" "string-hash-64" "^1.0.3" @@ -7465,7 +7468,10 @@ react-native-svg-transformer@^0.14.3: "integrity" "sha512-agDGdMeeBAsWEgg/u7mjtR2Z3c8smGCLep/n3svwifut9dpswZCP+bSIrU8ekg6RNtxAJL+eGJbWjJ38vWxw6g==" "resolved" "https://registry.npmjs.org/react-native-svg-transformer/-/react-native-svg-transformer-0.14.3.tgz" "version" "0.14.3" +<<<<<<< HEAD >>>>>>> cf2a5b72 (Merged with new master and updated for device deployment.) +======= +>>>>>>> 657bfed7 (Fixed yarn file.) dependencies: "@svgr/core" "^4.3.3" "@svgr/plugin-svgo" "^4.3.1" |