Update patch set 6
Patch Set 6: 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 896962,17 Patch-set: 6 Tag: autogenerated:zuul:check 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
da038bd2ec
commit
9e4c7ae295