Skip to content

fixing the merge conflicts so that you can refresh on reload#212

Merged
Ryaken-Nakamoto merged 1 commit intomainfrom
ticket_200_merge_conflict_resolution
Nov 24, 2025
Merged

fixing the merge conflicts so that you can refresh on reload#212
Ryaken-Nakamoto merged 1 commit intomainfrom
ticket_200_merge_conflict_resolution

Conversation

@jaydencarvajal511
Copy link

Same as the other two prs but this one works.

Copy link

@Ryaken-Nakamoto Ryaken-Nakamoto left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice!

@Ryaken-Nakamoto Ryaken-Nakamoto merged commit b66ab3b into main Nov 24, 2025
3 checks passed
@Ryaken-Nakamoto Ryaken-Nakamoto deleted the ticket_200_merge_conflict_resolution branch November 24, 2025 22:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants