search

filecoin-project / FIPs

The Filecoin Improvement Proposal repository
313 stars 165 forks source link

FIP-0083: fix bad conflict resolution for #968 & #964 #980

Closed rvagg closed 6 months ago

rvagg commented 6 months ago

"client" in verifier-balance was merge-resolved out

Closes: https://github.com/filecoin-project/FIPs/pull/971