diff --git a/android/app/build.gradle b/android/app/build.gradle index 524a1eb14bf6..18e95556867c 100644 --- 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 index 7f3b72757fcb..23384a1402e5 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -40,11 +40,7 @@ CFBundleVersion -<<<<<<< HEAD - 9.0.0.1 -======= 9.0.0.0 ->>>>>>> 5b0d3e8 (Merge pull request #44045 from Expensify/andrew-hybrid-verison-9) FullStory OrgId diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index 1de879fcf4f7..2c4191ab0703 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,10 +19,6 @@ CFBundleSignature ???? CFBundleVersion -<<<<<<< HEAD - 9.0.0.1 -======= 9.0.0.0 ->>>>>>> 5b0d3e8 (Merge pull request #44045 from Expensify/andrew-hybrid-verison-9) diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist index f11ce3cc47ea..11eebb990594 100644 --- a/ios/NotificationServiceExtension/Info.plist +++ b/ios/NotificationServiceExtension/Info.plist @@ -13,11 +13,7 @@ CFBundleShortVersionString 9.0.0 CFBundleVersion -<<<<<<< HEAD - 9.0.0.1 -======= 9.0.0.0 ->>>>>>> 5b0d3e8 (Merge pull request #44045 from Expensify/andrew-hybrid-verison-9) NSExtension NSExtensionPointIdentifier diff --git a/package-lock.json b/package-lock.json index 75e0ce05d492..4db3048e6ab4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,20 +1,12 @@ { "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) "lockfileVersion": 3, "requires": true, "packages": { "": { "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) "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index afe673aad3f1..49c8dc84a15d 100644 --- 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.",