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.

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

fix: rebase fail #10553

Merged
merged 2 commits into from
Oct 11, 2024
Merged

fix: rebase fail #10553

merged 2 commits into from
Oct 11, 2024

Conversation

almeidx
Copy link
Member

@almeidx almeidx commented Oct 11, 2024

Please describe the changes this PR makes and why it should be merged:
Unfortunately #10519 was merged automatically by Kodiak after a bad rebase, which reverted some changes made by other commits.

Status and versioning classification:

almeidx and others added 2 commits October 11, 2024 22:12
Co-authored-by: Luna <84203950+Wolvinny@users.noreply.github.com>
@almeidx almeidx requested a review from a team as a code owner October 11, 2024 21:15
Copy link

vercel bot commented Oct 11, 2024

The latest updates on your projects. Learn more about Vercel for Git ↗︎

2 Skipped Deployments
Name Status Preview Comments Updated (UTC)
discord-js ⬜️ Ignored (Inspect) Oct 11, 2024 9:15pm
discord-js-guide ⬜️ Ignored (Inspect) Oct 11, 2024 9:15pm

@almeidx almeidx changed the title Fix/rebase fail fix: rebase fail Oct 11, 2024
@Jiralite Jiralite added this to the discord.js 14.17 milestone Oct 11, 2024
@vladfrangu vladfrangu merged commit 960a80d into main Oct 11, 2024
9 of 10 checks passed
@vladfrangu vladfrangu deleted the fix/rebase-fail branch October 11, 2024 22:11
@Jiralite Jiralite removed the blocked label Oct 11, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

4 participants