mirror of
https://gitee.com/sui-feng-cb/AzurLaneAutoScript1
synced 2026-03-12 10:58:21 +08:00
merge alas
This commit is contained in:
@@ -25,10 +25,7 @@
|
||||
"EventGeneral",
|
||||
"Event",
|
||||
"Event2",
|
||||
<<<<<<< HEAD
|
||||
"Event3",
|
||||
=======
|
||||
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
|
||||
"Raid",
|
||||
"Coalition",
|
||||
"MaritimeEscort",
|
||||
|
||||
Reference in New Issue
Block a user