Skip to content

Commit

Permalink
Rebase fixes.
Browse files Browse the repository at this point in the history
  • Loading branch information
@ice-myles
ice-myles committed Dec 15, 2023
1 parent 7d3a746 commit 0fcdf04
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
3 changes: 3 additions & 0 deletions model/model.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ import (
"context"
"fmt"
"strconv"
stdlibtime "time"

"github.com/pkg/errors"

"github.com/ice-blockchain/eskimo/users"
"github.com/ice-blockchain/wintr/log"
Expand Down
1 change: 0 additions & 1 deletion tokenomics/users.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,6 @@ func (s *usersTableSource) replaceUser(ctx context.Context, usr *users.User) err
model.IDT0Field
model.IDTMinus1Field
model.HideRankingField
model.BalanceForTMinus1Field
}
)
dbUser, err := storage.Get[user](ctx, s.db, model.SerializedUsersKey(internalID))
Expand Down

0 comments on commit 0fcdf04

Please sign in to comment.