Skip to content

Commit

Permalink
fix conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
NJ-2020 committed Oct 26, 2024
1 parent b7c1cfa commit 5755336
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
9 changes: 5 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down

0 comments on commit 5755336

Please sign in to comment.