Fix conflicts

Expensify · Oct 19, 2023 · 272c717 · 272c717
2 parents eaafdd8 + 26c9d84
commit 272c717
Show file tree

Hide file tree

Showing 158 changed files with 5,592 additions and 2,276 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -90,8 +90,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001038601
-        versionName "1.3.86-1"
+        versionCode 1001038701
+        versionName "1.3.87-1"
     }
 
     flavorDimensions "default"

diff --git a/assets/images/bankicons/american-express.svg b/assets/images/bankicons/american-express.svg
diff --git a/assets/images/bankicons/bank-of-america.svg b/assets/images/bankicons/bank-of-america.svg
diff --git a/assets/images/bankicons/bb-t.svg b/assets/images/bankicons/bb-t.svg
diff --git a/assets/images/bankicons/capital-one.svg b/assets/images/bankicons/capital-one.svg