fix conflict

Expensify · Dec 24, 2024 · adaf189 · adaf189
2 parents 72da798 + 8b7096f
commit adaf189
Show file tree

Hide file tree

Showing 78 changed files with 2,164 additions and 449 deletions.
diff --git a/Mobile-Expensify b/Mobile-Expensify
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -110,8 +110,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009007706
-        versionName "9.0.77-6"
+        versionCode 1009007801
+        versionName "9.0.78-1"
         // 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/assets/images/buildings.svg b/assets/images/buildings.svg
diff --git a/assets/images/simple-illustrations/simple-illustration__building.svg b/assets/images/simple-illustrations/simple-illustration__building.svg
diff --git a/assets/images/simple-illustrations/simple-illustration__buildings.svg b/assets/images/simple-illustrations/simple-illustration__buildings.svg