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(ui): bad merge conflict #7273

Merged
merged 1 commit into from
Nov 5, 2024
Merged

fix(ui): bad merge conflict #7273

merged 1 commit into from
Nov 5, 2024

Conversation

maryhipp
Copy link
Collaborator

@maryhipp maryhipp commented Nov 5, 2024

Summary

fix typo from bad merge conflict

Related Issues / Discussions

QA Instructions

Merge Plan

Checklist

  • The PR has a short but descriptive title, suitable for a changelog
  • Tests added / updated (if applicable)
  • Documentation added / updated (if applicable)

@github-actions github-actions bot added the frontend PRs that change frontend files label Nov 5, 2024
@maryhipp maryhipp merged commit d046084 into main Nov 5, 2024
14 checks passed
@maryhipp maryhipp deleted the maryhipp/fix-typo branch November 5, 2024 21:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hipsterusername hipsterusername hipsterusername approved these changes

@psychedelicious psychedelicious Awaiting requested review from psychedelicious psychedelicious is a code owner

@blessedcoolant blessedcoolant Awaiting requested review from blessedcoolant blessedcoolant is a code owner

Assignees
No one assigned
Labels
frontend PRs that change frontend files
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@maryhipp @hipsterusername