tree 610343f8477781e6b2c4f251831731e7b53ba9b0
parent f9cea148d88f2a3570fc2f81a5931f96d20194f1
author msta <msta@google.com> 1785893573 +1000
committer Matt Stark <msta@google.com> 1785898020 -0700

Fix a conflict from merging two commits.

One commit added methods to a trait, and the other added an
implementation of said trait. They didn't result in merge conflicts, but
do result in compile errors.

Bug: 528225104
Change-Id: I651d5d7ed3ea0b92e484e024649453d86a6a6964
Reviewed-on: https://gn-review.googlesource.com/c/gn/+/24841
Reviewed-by: Takuto Ikuta <tikuta@google.com>
Commit-Queue: Matt Stark <msta@google.com>