1
0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-12 05:08:19 +08:00

merge alas

This commit is contained in:
SevCrane
2024-06-05 23:57:58 +08:00
parent 3cb29a9a37
commit abfbbe5064
146 changed files with 0 additions and 13646 deletions

View File

@@ -64,11 +64,7 @@ class Frame(Base):
"header",
[
put_html(Icon.ALAS).style("--header-icon--"),
<<<<<<< HEAD
put_text("AlasGG").style("--header-text--"),
=======
put_text("Alas").style("--header-text--"),
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
put_scope("header_status"),
put_scope("header_title"),
],