merge conflict fix
This commit is contained in:
1 parent
530016ef84
commit
31d39ffb37
1 file changed
+1
-1
@@ -263,4 +263,4 @@ class OngekiServlet(BaseServlet):
|
|||||||
bytes.fromhex(self.game_cfg.crypto.keys[internal_ver][1]),
|
bytes.fromhex(self.game_cfg.crypto.keys[internal_ver][1]),
|
||||||
)
|
)
|
||||||
|
|
||||||
return crypt.encrypt(padded)
|
return crypt.encrypt(padded)
|
||||||
Reference in new issue
Block a user