[OS-BUILD PATCH] .gitignore: fix previous mismerge with "HEAD line"

[Herton Krzesinski (via Email Bridge)]

From: Herton R. Krzesinski

.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

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

From: CKI Admin Bot on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/877#note_49754131...

Hi! This is the friendly CKI test bot.

It appears that you are not a member of redhat/red-hat-ci-
tools/kernel/cki-runs/trusted-pipelines. This means that the CI
pipeline on your MR will fail. As getting testing is important, I'll be
responsible for testing your changes. After every MR change, I'll start
a
small testing pipeline and link it here so you can follow the results.
I'll
also create and link a pipeline for hardware testing that the reviewers
can
start to get extra test coverage.

You can find more details about the contributor setup, permission issues
and
how to resolve them at
https://cki-project.org/docs/user_docs/gitlab-mr-testing/#trusted-and-
external-contributors

From: CKI Admin Bot on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/877#note_49754133...

Testing pipeline status:
Basic testing pipeline:

  https://gitlab.com/redhat/red-hat-ci-tools/kernel/cki-
runs/external-pipelines/-/pipelines/248931884 - created
:hourglass_flowing_sand:

From: CKI Bot on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/877#note_49869705...

Acked-by: Patrick Talbert 
(via approve button)

From: Patrick Talbert on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/877#note_49869813...

An obvious fix.