merge conflict fix

titles/ongeki/index.py

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