merge conflict fix

This commit is contained in:
phantomlan 2023-11-09 10:29:42 +01:00 committed by phantomlan
parent 530016ef84
commit 31d39ffb37

View File

@ -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)