From 31d39ffb37e0f1e123c14fceaec5365470d4cdf5 Mon Sep 17 00:00:00 2001
From: phantomlan <vernorek@gmail.com>
Date: Thu, 9 Nov 2023 10:29:42 +0100
Subject: [PATCH] merge conflict fix

---
 titles/ongeki/index.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/titles/ongeki/index.py b/titles/ongeki/index.py
index 9cc8891..edb06ba 100644
--- a/titles/ongeki/index.py
+++ b/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)
\ No newline at end of file
+        return crypt.encrypt(padded)