Skip to content

Commit

Permalink
Fix merge errors
Browse files Browse the repository at this point in the history
  • Loading branch information
fasmat authored and kacpersaw committed Mar 29, 2024
1 parent c014fb2 commit 76808fd
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 11 deletions.
2 changes: 1 addition & 1 deletion release/go/spacemesh/v2alpha1/network.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 2 additions & 10 deletions release/go/spacemesh/v2alpha1/network.pb.gw.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 76808fd

Please sign in to comment.