From 5755336fb43c08bba67f7db87763a742f81d2601 Mon Sep 17 00:00:00 2001 From: NJ-2020 Date: Sat, 26 Oct 2024 05:03:45 -0700 Subject: [PATCH 1/2] fix conflicts --- package-lock.json | 9 +++++---- package.json | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7202ef76ab66..f6c9a81b9eab 100644 --- a/package-lock.json +++ b/package-lock.json @@ -51,7 +51,7 @@ "date-fns-tz": "^3.2.0", "dom-serializer": "^0.2.2", "domhandler": "^4.3.0", - "expensify-common": "2.0.100", + "expensify-common": "2.0.101", "expo": "51.0.31", "expo-av": "14.0.7", "expo-image": "1.12.15", @@ -24050,9 +24050,10 @@ } }, "node_modules/expensify-common": { - "version": "2.0.100", - "resolved": "https://registry.npmjs.org/expensify-common/-/expensify-common-2.0.100.tgz", - "integrity": "sha512-mektI+OuTywYU47Valjsn2+kLQ1/Wc9sWCY1/a0Vo8IHTXroQWvbKs5IXlkiqODi4SRonVZwOL3ha/oJD7o7nQ==", + "version": "2.0.101", + "resolved": "https://registry.npmjs.org/expensify-common/-/expensify-common-2.0.101.tgz", + "integrity": "sha512-5TStDQGsXGJjdk64PBhEdXz/3H6QDlgoanEWI076okL5un4Qd2sSRfxHRiH61foHGsswXJFIZBHK3sysKDOJ4A==", + "license": "MIT", "dependencies": { "awesome-phonenumber": "^5.4.0", "classnames": "2.5.0", diff --git a/package.json b/package.json index f0425a747967..e098544ed7b2 100644 --- a/package.json +++ b/package.json @@ -3,8 +3,8 @@ "version": "9.0.54-1", "author": "Expensify, Inc.", "homepage": "https://new.expensify.com", - "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.", "license": "MIT", + "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.", "private": true, "scripts": { "configure-mapbox": "./scripts/setup-mapbox-sdk-walkthrough.sh", @@ -107,7 +107,7 @@ "date-fns-tz": "^3.2.0", "dom-serializer": "^0.2.2", "domhandler": "^4.3.0", - "expensify-common": "2.0.100", + "expensify-common": "2.0.101", "expo": "51.0.31", "expo-av": "14.0.7", "expo-image": "1.12.15", From 2d7b115cf2b2884272e3479879b9f1ebfb68824b Mon Sep 17 00:00:00 2001 From: NJ-2020 Date: Tue, 29 Oct 2024 00:27:24 -0700 Subject: [PATCH 2/2] revert package.json file --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e098544ed7b2..bed92dbadbd1 100644 --- a/package.json +++ b/package.json @@ -3,8 +3,8 @@ "version": "9.0.54-1", "author": "Expensify, Inc.", "homepage": "https://new.expensify.com", - "license": "MIT", "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.", + "license": "MIT", "private": true, "scripts": { "configure-mapbox": "./scripts/setup-mapbox-sdk-walkthrough.sh",