Update patch set 4
Patch Set 4: Verified-1 Merge Failed. This change or one of its cross-repo dependencies was unable to be automatically merged with the current state of its repository. Please rebase the change and upload a new patchset. Warning: Error merging gerrit/starlingx/update for 906005,7 Patch-set: 4 Tag: autogenerated:zuul:check Reviewer: Gerrit User 22348 <22348@4a232e18-c5a9-48ee-94c0-e04e7cca6543> Label: Verified=-1, 17e05f42f7d95ef2f602a82a5940c4e7a6e67699 Attention: {"person_ident":"Gerrit User 34895 \u003c34895@4a232e18-c5a9-48ee-94c0-e04e7cca6543\u003e","operation":"ADD","reason":"A robot voted negatively on a label"}
This commit is contained in:
parent
f7bfdfb35f
commit
01e1e081ad