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 erroneous duplicate lines from failed merge conflict resolution #87

Merged
merged 2 commits into from
May 14, 2024

Conversation

sjefferson99
Copy link
Member

No description provided.

@sjefferson99 sjefferson99 linked an issue May 14, 2024 that may be closed by this pull request
Copy link
Collaborator

@sam57719 sam57719 left a comment

Choose a reason for hiding this comment

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

Still a couple duplicate lines - 41 and 58

@sjefferson99
Copy link
Member Author

@sam57719 Removed them as well.

@sam57719 sam57719 merged commit 3aa7c8f into develop May 14, 2024
@sam57719 sam57719 deleted the 86-fix-smibhid-duplicate-lines branch May 14, 2024 21:28
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.

Fix smibhid duplicate lines
2 participants