commit 1d545c05ddb18602b4972324c3f7666e45a8520c
author Dean Birch <dean.birch@arm.com> Fri May 29 14:09:21 2020 +0100
committer Dean Birch <dean.birch@arm.com> Fri May 29 14:09:21 2020 +0100
tree d38edfb7d85ca44497821cfd0f2b63aaf4f639fa
parent 15c8ffe09f69d1640cdd5a1adb0e03ca012bd3cf

Fixing merge conflict errors

This should help LAVA job submissions amongst other areas.

Change-Id: I2e4b154ea63c30b38bc0d681adbe2416275170f0

lava_helper/jinja2_templates/mps2.jinja2

diff --git a/lava_helper/jinja2_templates/mps2.jinja2 b/lava_helper/jinja2_templates/mps2.jinja2
index 870c95f..4f023b8 100644
--- a/lava_helper/jinja2_templates/mps2.jinja2
+++ b/lava_helper/jinja2_templates/mps2.jinja2
@@ -19,11 +19,10 @@
       recovery_image:
         url: {{ recovery_image_url }}
         compression: gz
-    namespace: target
-    test_binary_1:
-      url: {{ firmware_url}}
-    test_binary_2:
-      url: {{ bootloader_url }}
+      test_binary_1:
+        url: {{ firmware_url }}
+      test_binary_2:
+        url: {{ bootloader_url }}
     namespace: target
 
 - boot: