m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-25 11:28:51 +01:00
Code

Patch conflict fix

Browse Source
This commit is contained in:
ryanml 2023-01-10 10:14:23 -07:00
parent 4ca9390c0a
commit 94c3e1ec73
1 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.yarn/patches/fast-json-patch-npm-2.2.1-63b021bb37.patch
View File

@ -1,14 +1,7 @@
<<<<<<< HEAD:.yarn/patches/fast-json-patch+3.1.1.patch
diff --git a/node_modules/fast-json-patch/commonjs/helpers.js b/node_modules/fast-json-patch/commonjs/helpers.js
index 5f2350e..8894686 100644
--- a/node_modules/fast-json-patch/commonjs/helpers.js
+++ b/node_modules/fast-json-patch/commonjs/helpers.js
=======
diff --git a/lib/helpers.js b/lib/helpers.js
index 0ac28b4d6a715e913da246f1b4b2576c7e5537f4..d048c0a9b498d08fb70337558fa541c1ecc2ed32 100644
--- a/lib/helpers.js
+++ b/lib/helpers.js
>>>>>>> origin/develop:.yarn/patches/fast-json-patch-npm-2.2.1-63b021bb37.patch
@@ -21,7 +21,7 @@ var _hasOwnProperty = Object.prototype.hasOwnProperty;
function hasOwnProperty(obj, key) {
return _hasOwnProperty.call(obj, key);
@ -17,8 +10,4 @@ index 0ac28b4d6a715e913da246f1b4b2576c7e5537f4..d048c0a9b498d08fb70337558fa541c1
+Object.defineProperty(exports, "hasOwnProperty", { value: hasOwnProperty });
function _objectKeys(obj) {
if (Array.isArray(obj)) {
<<<<<<< HEAD:.yarn/patches/fast-json-patch+3.1.1.patch
var keys_1 = new Array(obj.length);
=======
var keys = new Array(obj.length);
>>>>>>> origin/develop:.yarn/patches/fast-json-patch-npm-2.2.1-63b021bb37.patch