From 89a990ec830c03044fbd5a75d8833e6823a74aa2 Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 2 Aug 2021 11:44:48 -0400 Subject: Fixed yarn file. --- yarn.lock | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/yarn.lock b/yarn.lock index f2c16a42..8641bda9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7361,6 +7361,7 @@ "version" "2.0.0-rc.0" 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" -- cgit v1.2.3-70-g09d2