mirror of
https://github.com/inaturalist/iNaturalistReactNative.git
synced 2025-12-23 22:18:36 -05:00
Resolve merge conflict with package-lock version number
This commit is contained in:
6
package-lock.json
generated
6
package-lock.json
generated
@@ -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",
|
||||
|
||||
Reference in New Issue
Block a user