forked from Dniel97/artemis
merge conflict fix
This commit is contained in:
parent
530016ef84
commit
31d39ffb37
@ -263,4 +263,4 @@ class OngekiServlet(BaseServlet):
|
||||
bytes.fromhex(self.game_cfg.crypto.keys[internal_ver][1]),
|
||||
)
|
||||
|
||||
return crypt.encrypt(padded)
|
||||
return crypt.encrypt(padded)
|
||||
|
Loading…
Reference in New Issue
Block a user