Skip to content

Commit

Permalink
chore: resolve conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@johnletey
johnletey committed Mar 7, 2024
1 parent 48769a3 commit 635f8f0
Showing 1 changed file with 2 additions and 23 deletions.
25 changes: 2 additions & 23 deletions x/forwarding/types/tx.pb.go
View file

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

0 comments on commit 635f8f0

Please sign in to comment.