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

add metronome app (merge tuner firstly to satisfy conflict) #2431

Merged
merged 8 commits into from
Dec 18, 2024
Merged

add metronome app (merge tuner firstly to satisfy conflict) #2431

merged 8 commits into from
Dec 18, 2024
+404 −6

Conversation

zxkmm
Copy link
Contributor

@zxkmm zxkmm commented Dec 18, 2024 •
edited
Loading

@zxkmm zxkmm changed the title add metronome app add metronome app (merge tuner firstly to satisfy conflict) Dec 18, 2024
@zxkmm zxkmm marked this pull request as ready for review December 18, 2024 08:08
@zxkmm zxkmm enabled auto-merge (squash) December 18, 2024 08:08
@zxkmm zxkmm mentioned this pull request Dec 18, 2024
Merged
@gullradriel
Copy link
Member

Merged tuner first, yet you're still having conflicts

@zxkmm
Copy link
Contributor Author

zxkmm commented Dec 18, 2024

thanks! will fix now

@gullradriel
Copy link
Member

thanks! will fix now

I fixed it.

@zxkmm
Copy link
Contributor Author

zxkmm commented Dec 18, 2024

thx!

@zxkmm
Copy link
Contributor Author

zxkmm commented Dec 18, 2024

thanks! fixed

gullradriel
gullradriel approved these changes Dec 18, 2024
View reviewed changes
Copy link
Member

@gullradriel gullradriel left a comment

Choose a reason for hiding this comment

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

Good to go

@zxkmm zxkmm merged commit 9cea76a into portapack-mayhem:next Dec 18, 2024
3 checks passed
@zxkmm zxkmm deleted the add_metronome_app branch December 18, 2024 11:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gullradriel gullradriel gullradriel approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@zxkmm @gullradriel