Am 12.10.22 um 14:11 schrieb Nico Boehr:
diff --git a/s390x/unittests.cfg b/s390x/unittests.cfg index 2c04ae7c7c15..11cac3ca135d 100644 --- a/s390x/unittests.cfg +++ b/s390x/unittests.cfg @@ -185,6 +185,7 @@ groups = migration [migration-skey] file = migration-skey.elf groups = migration +<<<<<<< HEAD
looks like a wrong merge conflict leftover.
