From a5c63d3962f0a22b15d82fac8d1e80fcc9cccc82 Mon Sep 17 00:00:00 2001
From: Rory Abraham <47436092+roryabraham@users.noreply.github.com>
Date: Thu, 2 Jun 2022 15:44:44 -0700
Subject: [PATCH] Merge pull request #9272 from
 Expensify/version-PATCH-14176c54bfdc5c4a0d92d05759471c35e3e6aa97

(cherry picked from commit d27bb4e1abbbf02cf0f10d12f1776b6298e4c5d1)
---
 android/app/build.gradle         | 5 +++++
 ios/NewExpensify/Info.plist      | 6 +++++-
 ios/NewExpensifyTests/Info.plist | 6 +++++-
 package-lock.json                | 4 ++++
 package.json                     | 4 ++++
 5 files changed, 23 insertions(+), 2 deletions(-)

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 @@
 	<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
index f9e3b27d47ca..49c075691754 100644
--- 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
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.",