Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix failing workflows from unresolved conflicts #1950

Merged
merged 2 commits into from
Dec 16, 2023
Merged

Fix failing workflows from unresolved conflicts #1950

merged 2 commits into from
Dec 16, 2023

Conversation

mythilytm
Copy link
Collaborator

Primary reviewer:

Description

  • My last two PRs has merge conflicts that did not show up in the respective PRs but errors popped during the merge to master workflow.

Checklist

  • Corresponding issue has been opened
  • New tests added
  • Feature flags added
  • Strings are localized
  • Tested for chat contacts
  • Tested for call contacts

Related Issues

Fixes #....

Verification steps

@mythilytm mythilytm merged commit f0c7fb1 into master Dec 16, 2023
8 checks passed
@mythilytm mythilytm deleted the CHI-2329-resolve_conflits branch December 16, 2023 00:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@mythilytm