From: Herton R. Krzesinski <herton(a)redhat.com>
.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(a)redhat.com>
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