From 94c3e1ec733228cba111d02d71aa887cc7609897 Mon Sep 17 00:00:00 2001 From: ryanml Date: Tue, 10 Jan 2023 10:14:23 -0700 Subject: [PATCH] Patch conflict fix --- .../fast-json-patch-npm-2.2.1-63b021bb37.patch | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/.yarn/patches/fast-json-patch-npm-2.2.1-63b021bb37.patch b/.yarn/patches/fast-json-patch-npm-2.2.1-63b021bb37.patch index c38ffbf6a..866401a4a 100644 --- a/.yarn/patches/fast-json-patch-npm-2.2.1-63b021bb37.patch +++ b/.yarn/patches/fast-json-patch-npm-2.2.1-63b021bb37.patch @@ -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