remove a potential conflict

China-Digital-Times-CDT / nft

empower community by using cdtoken to issue NFTs under 404 economy

0 stars 3 forks source link

Closed gulprun closed 2 years ago

gulprun commented 2 years ago

I should not have resolved the conflict directly within remote upstream, re-PRing