Merge with new master.

1 files changed, 33 insertions, 0 deletions

diff --git a/yarn.lock b/yarn.lock
index 85044344..c4d4e36d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3725,12 +3725,21 @@
   "version" "3.1.2"
   dependencies:
     "prettier-linter-helpers" "^1.0.0"
+<<<<<<< HEAD
+
+"eslint-plugin-react-hooks@^3.0.0":
+  "integrity" "sha512-EjxTHxjLKIBWFgDJdhKKzLh5q+vjTFrqNZX36uIxWS4OfyXe5DawqPj3U5qeJ1ngLwatjzQnmR0Lz0J0YH3kxw=="
+  "resolved" "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-3.0.0.tgz"
+  "version" "3.0.0"
+
+=======
 
 "eslint-plugin-react-hooks@^3.0.0":
   "integrity" "sha512-EjxTHxjLKIBWFgDJdhKKzLh5q+vjTFrqNZX36uIxWS4OfyXe5DawqPj3U5qeJ1ngLwatjzQnmR0Lz0J0YH3kxw=="
   "resolved" "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-3.0.0.tgz"
   "version" "3.0.0"
 
+>>>>>>> 207a9d33eb9235d5e9da65fea7fc24d6f531e8c8
 "eslint-plugin-react-native-globals@^0.1.1":
   "integrity" "sha512-9aEPf1JEpiTjcFAmmyw8eiIXmcNZOqaZyHO77wgm0/dWfT/oxC1SrIq8ET38pMxHYrcB6Uew+TzUVsBeczF88g=="
   "resolved" "https://registry.npmjs.org/eslint-plugin-react-native-globals/-/eslint-plugin-react-native-globals-0.1.2.tgz"
@@ -7004,8 +7013,23 @@
     "ansi-regex" "^4.0.0"
     "ansi-styles" "^3.2.0"
     "react-is" "^16.8.4"
+<<<<<<< HEAD
 
 "pretty-format@^25.1.0":
+=======
+
+"pretty-format@^25.1.0":
+  "integrity" "sha512-kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ=="
+  "resolved" "https://registry.npmjs.org/pretty-format/-/pretty-format-25.5.0.tgz"
+  "version" "25.5.0"
+  dependencies:
+    "@jest/types" "^25.5.0"
+    "ansi-regex" "^5.0.0"
+    "ansi-styles" "^4.0.0"
+    "react-is" "^16.12.0"
+
+"pretty-format@^25.2.0":
+>>>>>>> 207a9d33eb9235d5e9da65fea7fc24d6f531e8c8
   "integrity" "sha512-kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ=="
   "resolved" "https://registry.npmjs.org/pretty-format/-/pretty-format-25.5.0.tgz"
   "version" "25.5.0"
@@ -7015,6 +7039,7 @@
     "ansi-styles" "^4.0.0"
     "react-is" "^16.12.0"
 
+<<<<<<< HEAD
 "pretty-format@^25.2.0":
   "integrity" "sha512-kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ=="
   "resolved" "https://registry.npmjs.org/pretty-format/-/pretty-format-25.5.0.tgz"
@@ -7025,6 +7050,8 @@
     "ansi-styles" "^4.0.0"
     "react-is" "^16.12.0"
 
+=======
+>>>>>>> 207a9d33eb9235d5e9da65fea7fc24d6f531e8c8
 "private@^0.1.6":
   "integrity" "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg=="
   "resolved" "https://registry.npmjs.org/private/-/private-0.1.8.tgz"
@@ -7363,6 +7390,7 @@
     "@babel/plugin-transform-object-assign" "^7.10.4"
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
     fbjs "^3.0.0"
     string-hash-64 "^1.0.3"
 
@@ -7415,6 +7443,8 @@ react-native-svg-transformer@^0.14.3:
 =======
 =======
 >>>>>>> 657bfed7 (Fixed yarn file.)
+=======
+>>>>>>> 207a9d33eb9235d5e9da65fea7fc24d6f531e8c8
     "fbjs" "^3.0.0"
     "string-hash-64" "^1.0.3"
 
@@ -7464,9 +7494,12 @@ react-native-svg-transformer@^0.14.3:
   "resolved" "https://registry.npmjs.org/react-native-svg-transformer/-/react-native-svg-transformer-0.14.3.tgz"
   "version" "0.14.3"
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> cf2a5b72 (Merged with new master and updated for device deployment.)
 =======
 >>>>>>> 657bfed7 (Fixed yarn file.)
+=======
+>>>>>>> 207a9d33eb9235d5e9da65fea7fc24d6f531e8c8
   dependencies:
     "@svgr/core" "^4.3.3"
     "@svgr/plugin-svgo" "^4.3.1"