Skip to content

Commit

Permalink
Merge branch 'main' into marius/bump-pfm-406
Browse files Browse the repository at this point in the history
  • Loading branch information
yaruwangway authored Aug 1, 2023
2 parents 0c96e6d + 1bab491 commit 5bc53ea
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,15 @@ import (
"github.com/cosmos/gaia/v12/app/keepers"
gaiaappparams "github.com/cosmos/gaia/v12/app/params"
"github.com/cosmos/gaia/v12/app/upgrades"
v11 "github.com/cosmos/gaia/v12/app/upgrades/v11"
v12 "github.com/cosmos/gaia/v12/app/upgrades/v12"
"github.com/cosmos/gaia/v12/x/globalfee"
)

var (
// DefaultNodeHome default home directories for the application daemon
DefaultNodeHome string

Upgrades = []upgrades.Upgrade{v11.Upgrade}
Upgrades = []upgrades.Upgrade{v12.Upgrade}
)

var (
Expand Down

0 comments on commit 5bc53ea

Please sign in to comment.