Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 1 commit into from
Apr 4, 2024
Merged

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

merged 1 commit into from
Apr 4, 2024

Commits on Apr 3, 2024

  1. FIP-0083: fix bad conflict resolution for filecoin-project#968 & file… 

    …coin-project#964

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

Closes: filecoin-project#971
    @rvagg
    rvagg committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    53a4da0 View commit details
    Browse the repository at this point in the history