Merge pull request #9272 from Expensify/version-PATCH-14176c54bfdc5c4…

…a0d92d05759471c35e3e6aa97 (cherry picked from commit d27bb4e)
Expensify · Jun 2, 2022 · a5c63d3 · a5c63d3
1 parent fd8aa64
commit a5c63d3
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 2 deletions.
diff --git 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
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.70</string>
+	<string>1.1.71</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -30,7 +30,11 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
+<<<<<<< HEAD
 	<string>1.1.71.1</string>
+=======
+	<string>1.1.71.0</string>
+>>>>>>> d27bb4e1a (Merge pull request #9272 from Expensify/version-PATCH-14176c54bfdc5c4a0d92d05759471c35e3e6aa97)
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
@@ -15,10 +15,14 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.70</string>
+	<string>1.1.71</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
+<<<<<<< HEAD
 	<string>1.1.71.1</string>
+=======
+	<string>1.1.71.0</string>
+>>>>>>> d27bb4e1a (Merge pull request #9272 from Expensify/version-PATCH-14176c54bfdc5c4a0d92d05759471c35e3e6aa97)
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
diff --git 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.",