diff --git a/android/app/build.gradle b/android/app/build.gradle index 954a49be9437..a838b25cdb27 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -152,8 +152,13 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion multiDexEnabled rootProject.ext.multiDexEnabled +<<<<<<< HEAD versionCode 1001017101 versionName "1.1.71-1" +======= + versionCode 1001017100 + versionName "1.1.71-0" +>>>>>>> d27bb4e1a (Merge pull request #9272 from Expensify/version-PATCH-14176c54bfdc5c4a0d92d05759471c35e3e6aa97) } splits { abi { diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index 30dd53f1cdff..01690df8aef3 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.1.70 + 1.1.71 CFBundleSignature ???? CFBundleURLTypes @@ -30,7 +30,11 @@ CFBundleVersion +<<<<<<< HEAD 1.1.71.1 +======= + 1.1.71.0 +>>>>>>> d27bb4e1a (Merge pull request #9272 from Expensify/version-PATCH-14176c54bfdc5c4a0d92d05759471c35e3e6aa97) ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index f9e3b27d47ca..49c075691754 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -15,10 +15,14 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 1.1.70 + 1.1.71 CFBundleSignature ???? CFBundleVersion +<<<<<<< HEAD 1.1.71.1 +======= + 1.1.71.0 +>>>>>>> d27bb4e1a (Merge pull request #9272 from Expensify/version-PATCH-14176c54bfdc5c4a0d92d05759471c35e3e6aa97) diff --git a/package-lock.json b/package-lock.json index c5f720dfb8ac..2077f9e8e52c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,10 @@ { "name": "new.expensify", +<<<<<<< HEAD "version": "1.1.71-1", +======= + "version": "1.1.71-0", +>>>>>>> d27bb4e1a (Merge pull request #9272 from Expensify/version-PATCH-14176c54bfdc5c4a0d92d05759471c35e3e6aa97) "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index db752afa8dab..97956d29b636 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,10 @@ { "name": "new.expensify", +<<<<<<< HEAD "version": "1.1.71-1", +======= + "version": "1.1.71-0", +>>>>>>> d27bb4e1a (Merge pull request #9272 from Expensify/version-PATCH-14176c54bfdc5c4a0d92d05759471c35e3e6aa97) "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.",