[w3c/payment-handler] Removed conflicts from Jake Archibald pull request (#327)

https://github.com/w3c/payment-handler/pull/305

The following tasks have been completed:

 * [ ] web platform tests (link)
 * [ ] MDN Docs added (link)

Implementation commitment:

 * [ ] Safari (link to issue)
 * [ ] Chrome (link to issue)
 * [ ] Firefox (link to issue)
 * [ ] Edge (public signal)

You can view, comment on, or merge this pull request online at:

  https://github.com/w3c/payment-handler/pull/327

-- Commit Summary --

  * Removed conflicts between gh-pages and

-- File Changes --

    M index.html (146)

-- Patch Links --

https://github.com/w3c/payment-handler/pull/327.patch
https://github.com/w3c/payment-handler/pull/327.diff

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/w3c/payment-handler/pull/327