Fix checked-in merge conflict markers from commit d4114e6 by awhalley · Pull Request #32 · chromium/chrome.security

✅ All contributors are covered under a CLA with Google

See https://cla.developers.google.com/ for more info about Google's Contributor License Agreement (CLA).

ℹ️ Googlers: Go here to view more details and manage scans for this pull request.

@awhalley

The following contributors were found for this pull request:

✅ f3dc9ab Author: @awhalley <aw****ey@google.com>

(Only the first commit for a unique contributor is listed.)