fix conflict

osmosis-labs · Nov 10, 2022 · 8a73512 · 8a73512
1 parent 21507ac
commit 8a73512
Show file tree

Hide file tree

Showing 8 changed files with 7,189 additions and 0 deletions.
diff --git a/github.com/osmosis-labs/osmosis/v12/x/epochs/types/genesis.pb.go b/github.com/osmosis-labs/osmosis/v12/x/epochs/types/genesis.pb.go
diff --git a/github.com/osmosis-labs/osmosis/v12/x/epochs/types/query.pb.go b/github.com/osmosis-labs/osmosis/v12/x/epochs/types/query.pb.go
diff --git a/github.com/osmosis-labs/osmosis/v12/x/epochs/types/query.pb.gw.go b/github.com/osmosis-labs/osmosis/v12/x/epochs/types/query.pb.gw.go