From: Herton R. Krzesinski <herton@xxxxxxxxxx> .gitignore: fix previous mismerge with "HEAD line" The merge conflict marker "<<<<<<< HEAD" was left over from a previous merge. Remove it. Signed-off-by: Herton R. Krzesinski <herton@xxxxxxxxxx> diff a/.gitignore b/.gitignore --- a/.gitignore +++ b/.gitignore @@ -153,7 +153,6 @@ x509.genkey # Clang's compilation database file /compile_commands.json -<<<<<<< HEAD # # Red Hat # -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/877 _______________________________________________ kernel mailing list -- kernel@xxxxxxxxxxxxxxxxxxxxxxx To unsubscribe send an email to kernel-leave@xxxxxxxxxxxxxxxxxxxxxxx Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/kernel@xxxxxxxxxxxxxxxxxxxxxxx
