sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-12 00:28:20 +08:00
Code Activity

merge alas

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

3
module/config/utils.py
View File

@@ -646,7 +646,6 @@ def type_to_str(typ):
return str(typ)
<<<<<<< HEAD
def time_delta(_timedelta):
"""
Output the delta between two times
@@ -689,7 +688,5 @@ def time_delta(_timedelta):
return _time_dict
=======
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
if __name__ == '__main__':
get_os_reset_remain()