Resolve merge conflict with package-lock version number

This commit is contained in:
Amanda Bullington
2025-04-10 15:34:03 -07:00
parent 0429ab9737
commit c0ac7a30b2

6
package-lock.json generated
View File

@@ -1,12 +1,16 @@
{
"name": "inaturalistreactnative",
"version": "0.59.14",
"version": "1.0.0",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "inaturalistreactnative",
<<<<<<< HEAD
"version": "0.59.14",
=======
"version": "1.0.0",
>>>>>>> b0f27aad3 (Update package-lock.json with version numer)
"hasInstallScript": true,
"dependencies": {
"@bam.tech/react-native-image-resizer": "^3.0.11",