WICG / webmonetization

Proposed Web Monetization standard
https://webmonetization.org
Other
466 stars 152 forks source link

chore: Resolve all the conflicting changes from the past 4 PRs #434

Closed huijing closed 9 months ago

huijing commented 9 months ago

We put off merging PRs for too long and everyone touched all the files plus prettier and all the things, TLDR much conflict. After fixing conflicts on the individual PRs, this should finally wrap up all the changes. Or not. 乁⁠(⁠ ⁠•⁠_⁠•⁠ ⁠)⁠ㄏ Let's merge PRs quickly next time.

netlify[bot] commented 9 months ago

Deploy Preview for webmonetization-preview ready!

Name Link
Latest commit 2958cd7c82b68c302067e2e000a7fcfc36af5780
Latest deploy log https://app.netlify.com/sites/webmonetization-preview/deploys/65cc24b976e4a300088812b5
Deploy Preview https://deploy-preview-434--webmonetization-preview.netlify.app
Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.