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

remove duplicate #include. fix typos. #1228

Merged
merged 6 commits into from
Apr 10, 2024
Merged

remove duplicate #include. fix typos. #1228

merged 6 commits into from
Apr 10, 2024

Conversation

RainRat
Copy link
Contributor

@RainRat RainRat commented Apr 10, 2024

No description provided.

Copy link
Contributor

@micahsnyder micahsnyder left a comment

Choose a reason for hiding this comment

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

Thanks @RainRat looks good.

@micahsnyder
Copy link
Contributor

@RainRat Oh just saw there are conflicts. Can you rebase with the upstream main branch to resolve them?

typos only (no functional changes)
Undo functional change. I'll do it in a separate pull
no functional changes
@RainRat
Copy link
Contributor Author

RainRat commented Apr 10, 2024

Oh no, I think I did the reverse.

@RainRat
Copy link
Contributor Author

RainRat commented Apr 10, 2024

Ok, I think it's good now

@micahsnyder micahsnyder merged commit 143d23c into Cisco-Talos:main Apr 10, 2024
23 checks passed
@micahsnyder
Copy link
Contributor

Thanks @RainRat

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.

2 participants