fix conflicts

141d3ef

Select commit

Loading

Failed to load commit list.

Uh oh!

There was an error while loading. Please reload this page.

Codecov

codecov/patch

Remote Build Android on: push

build (developmentDebug, false)

build (Debug, true)

Remote Build iOS on: push

build (New Expensify Dev, DebugDevelopment, false)

build (Expensify Dev, Debug, true)

PR Author Checklist on: pull_request_target

checklist

CLA Assistant on: pull_request_target

CLA / CLA

PR Reviewer Checklist on: pull_request_review

checklist

TypeScript Checks on: pull_request

typecheck

Verify signed commits on: pull_request

verifySignedCommits

Check unused styles on: pull_request

Check for unused styles

ESLint check on: pull_request 10

ESLint check

🧙 Check spell on: pull_request

🔍 spellcheck

.github/workflows/translationDryRun.yml on: pull_request

dryRun

Changed files ESLint check on: pull_request 10

Changed files ESLint check

Prettier check on: pull_request

Prettier check

imgbot Image Optimization on: pull_request

approveAndMerge

Jest Unit Tests on: pull_request

test (job 1)

test (job 2)

test (job 3)

Storybook tests

PR Reviewer Checklist on: pull_request_review

checklist

PR Reviewer Checklist on: pull_request_review

checklist

fix conflicts

Uh oh!

Select a check to view from the sidebar