aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-yocto-bsp/lib/oeqa/selftest/systemd_boot.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/meta-yocto-bsp/lib/oeqa/selftest/systemd_boot.py b/meta-yocto-bsp/lib/oeqa/selftest/systemd_boot.py
index d7b9c739211..9660c87c5e2 100644
--- a/meta-yocto-bsp/lib/oeqa/selftest/systemd_boot.py
+++ b/meta-yocto-bsp/lib/oeqa/selftest/systemd_boot.py
@@ -100,4 +100,3 @@ class Systemdboot(oeSelfTest):
self.assertEqual(result.output.split()[0], result.output.split()[2],
'checksums from %s and %s are different'
% (imagebootfile, systemdbootfile))
->>>>>>> contrib/joseperez/systemd_2ndTC