mirror of
https://gitea.tendokyu.moe/Hay1tsme/artemis.git
synced 2026-02-04 14:47:29 +08:00
merge conflict fix
This commit is contained in:
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user