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

Follow-up on #18447: Unintentional deletion during merge-conflicts resolution #20991

Merged

Conversation

JunkuiZhang
Copy link
Contributor

After #18447 was merged, I reviewed the PR code as usual. During this review, I realized that some code was unintentionally removed when I was resolving merge conflicts in #18447.

Sorry!

Release Notes:

  • N/A

@JunkuiZhang JunkuiZhang marked this pull request as ready for review November 21, 2024 15:33
@mikayla-maki
Copy link
Contributor

Thanks for the quick catch!

@mikayla-maki mikayla-maki merged commit 9211e69 into zed-industries:main Nov 21, 2024
10 checks passed
@notpeter notpeter added the cla-signed The user has signed the Contributor License Agreement label Nov 22, 2024
Anthony-Eid pushed a commit to Anthony-Eid/zed that referenced this pull request Nov 22, 2024
…e-conflicts resolution (zed-industries#20991)

After zed-industries#18447 was merged, I reviewed the PR code as usual. During this
review, I realized that some code was unintentionally removed when I was
resolving merge conflicts in zed-industries#18447.

Sorry!

Release Notes:

- N/A
@JunkuiZhang JunkuiZhang deleted the windows/no-cmd-window-fix branch November 23, 2024 15:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla-signed The user has signed the Contributor License Agreement
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants