search

celestiaorg / celestia-app

Celestia consensus node
https://celestiaorg.github.io/celestia-app/
Apache License 2.0
345 stars 292 forks source link

fix: make check-bbr (backport #4004) #4012

Closed mergify[bot] closed 3 weeks ago

mergify[bot] commented 3 weeks ago

Overview

very minor fix that fixes the check-bbr command

This is an automatic backport of pull request #4004 done by Mergify.

mergify[bot] commented 3 weeks ago

Cherry-pick of c410d8801ac1f8e01cd5a3498e02398ebebb0748 has failed:

On branch mergify/bp/v2.x/pr-4004
Your branch is up to date with 'origin/v2.x'.

You are currently cherry-picking commit c410d880.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
    both modified:   Makefile

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally