fix conflicts

Expensify · Oct 7, 2024 · bbfb8f8 · bbfb8f8
2 parents 23f6476 + 7981265
commit bbfb8f8
Show file tree

Hide file tree

Showing 58 changed files with 997 additions and 558 deletions.
diff --git a/.github/workflows/buildAndroid.yml b/.github/workflows/buildAndroid.yml
@@ -41,6 +41,7 @@ on:
         description: Git ref to checkout and build
         required: true
         type: string
+
       pull_request_number:
         description: The pull request number associated with this build, if relevant.
         type: number

diff --git a/.github/workflows/buildIOS.yml b/.github/workflows/buildIOS.yml