Re: [w3c/webpayments-payment-apps-api] Design considerations for payment app registration: recommended apps, user consent, and optional registration (#21)

Hi @jnormore,

I went to merge this but there are conflicts. I have not endeavored to resolve conflicts by hand before. Anybody want to help?

Ian

---
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/webpayments-payment-apps-api/pull/21#issuecomment-238695619

Received on Tuesday, 9 August 2016 21:22:24 UTC