Need to fix conflict.

View Change

To view, visit change 40275. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: flashrom
Gerrit-Branch: master
Gerrit-Change-Id: I8637129421a3b0f96bd8dffa4f50783ea6931967
Gerrit-Change-Number: 40275
Gerrit-PatchSet: 1
Gerrit-Owner: Scott Chao <scott.chao@bitland.corp-partner.google.com>
Gerrit-Reviewer: Edward O'Callaghan <quasisec@chromium.org>
Gerrit-Reviewer: Hung-Te Lin <hungte@chromium.org>
Gerrit-Reviewer: Martin Roth <martinroth@google.com>
Gerrit-Reviewer: Patrick Georgi <pgeorgi@google.com>
Gerrit-Reviewer: Peichao Li <peichao.wang@bitland.corp-partner.google.com>
Gerrit-Reviewer: Yu-Ping Wu <yupingso@google.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org>
Gerrit-CC: Casper Chang <casper.chang@bitland.corp-partner.google.com>
Gerrit-CC: Paul Ma <magf@bitland.com.cn>
Gerrit-Comment-Date: Thu, 09 Apr 2020 00:22:52 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: No
Gerrit-MessageType: comment