resolve conflict

elys-network · Feb 14, 2024 · a185030 · a185030
2 parents 447060d + 4ab7cbe
commit a185030
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/x/stablestake/module.go b/x/stablestake/module.go
@@ -117,7 +117,7 @@ func (am AppModule) RegisterServices(cfg module.Configurator) {
 	types.RegisterMsgServer(cfg.MsgServer(), keeper.NewMsgServerImpl(am.keeper))
 	types.RegisterQueryServer(cfg.QueryServer(), am.keeper)
 	m := migrations.NewMigrator(am.keeper)
-	err := cfg.RegisterMigration(types.ModuleName, 2, m.V2Migration)
+	err := cfg.RegisterMigration(types.ModuleName, 1, m.V2Migration)
 	if err != nil {
 		panic(err)
 	}