fix conflicts

This commit is contained in:
wish
2023-07-24 23:42:51 +10:00
parent 2a9504cd26
commit a3e1207dfd
2 changed files with 2 additions and 2 deletions

View File

@@ -12,7 +12,7 @@ import (
"golang.org/x/crypto/bcrypt"
)
func (s *Server) newUserChara(uid int) error {
func (s *Server) newUserChara(uid uint32) error {
var numNewChars int
err := s.db.QueryRow("SELECT COUNT(*) FROM characters WHERE user_id = $1 AND is_new_character = true", uid).Scan(&numNewChars)
if err != nil {