Skip to content

iwyu.yml: fixed merge error [skip ci]#7287

Merged
firewave merged 1 commit intocppcheck-opensource:mainfrom
firewave:iwyu-merge
Feb 6, 2025
Merged

iwyu.yml: fixed merge error [skip ci]#7287
firewave merged 1 commit intocppcheck-opensource:mainfrom
firewave:iwyu-merge

Conversation

@firewave
Copy link
Copy Markdown
Collaborator

@firewave firewave commented Feb 6, 2025

No description provided.

@firewave
Copy link
Copy Markdown
Collaborator Author

firewave commented Feb 6, 2025

There was a merge conflict and resolving that somehow duplicated the clang-include-cleaner. I have no idea how that happened as I did nothing different to other conflicts.

@firewave firewave merged commit 83c9a57 into cppcheck-opensource:main Feb 6, 2025
@firewave firewave deleted the iwyu-merge branch February 6, 2025 02:01
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.

1 participant