tree d38edfb7d85ca44497821cfd0f2b63aaf4f639fa
parent 15c8ffe09f69d1640cdd5a1adb0e03ca012bd3cf
author Dean Birch <dean.birch@arm.com> 1590757761 +0100
committer Dean Birch <dean.birch@arm.com> 1590757761 +0100

Fixing merge conflict errors

This should help LAVA job submissions amongst other areas.

Change-Id: I2e4b154ea63c30b38bc0d681adbe2416275170f0