Resolve conflicts - use 9.0.0-0

Expensify · Jun 20, 2024 · 5b47e79 · 5b47e79
1 parent dc203be
commit 5b47e79
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 29 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -107,13 +107,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-<<<<<<< HEAD
-        versionCode 1009000001
-        versionName "9.0.0-1"
-=======
         versionCode 1009000000
         versionName "9.0.0-0"
->>>>>>> 5b0d3e8 (Merge pull request #44045 from Expensify/andrew-hybrid-verison-9)
         // Supported language variants must be declared here to avoid from being removed during the compilation.
         // This also helps us to not include unnecessary language variants in the APK.
         resConfigs "en", "es"

diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
@@ -40,11 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-<<<<<<< HEAD
-	<string>9.0.0.1</string>
-=======
 	<string>9.0.0.0</string>
->>>>>>> 5b0d3e8 (Merge pull request #44045 from Expensify/andrew-hybrid-verison-9)
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>

diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
@@ -19,10 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-<<<<<<< HEAD
-	<string>9.0.0.1</string>
-=======
 	<string>9.0.0.0</string>
->>>>>>> 5b0d3e8 (Merge pull request #44045 from Expensify/andrew-hybrid-verison-9)
 </dict>
 </plist>
diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist
@@ -13,11 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.0.0</string>
 	<key>CFBundleVersion</key>
-<<<<<<< HEAD
-	<string>9.0.0.1</string>
-=======
 	<string>9.0.0.0</string>
->>>>>>> 5b0d3e8 (Merge pull request #44045 from Expensify/andrew-hybrid-verison-9)
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,10 +1,6 @@
 {
   "name": "new.expensify",
-<<<<<<< HEAD
-  "version": "9.0.0-1",
-=======
   "version": "9.0.0-0",
->>>>>>> 5b0d3e8 (Merge pull request #44045 from Expensify/andrew-hybrid-verison-9)
   "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.",