man!

e3fd7c3a · 聖園ミカ · d5210145 · 42e2f47e · e3fd7c3a
Commit e3fd7c3a authored Jan 19, 2025 by 聖園ミカ 🐟
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

data/dialogues-222.json data/dialogues-222.json +2 -1

No files found.
--- a/data/dialogues-222.json
+++ b/data/dialogues-222.json
 {
+<<<<<<< HEAD
 	"35595518": [
 		"正义双刃，解离连接的锁链，破杀而出！"
 	],
@@ -596,4 +597,4 @@
 	"88123000": [
 		"算了……勉为其难帮你一把好了。"
 	]
-}
+}
\ No newline at end of file