mirror of
https://gitee.com/sui-feng-cb/AzurLaneAutoScript1
synced 2026-03-12 12:08:21 +08:00
merge alas
This commit is contained in:
@@ -57,10 +57,7 @@ class RequestHumanTakeover(Exception):
|
||||
# Request human takeover
|
||||
# Alas is unable to handle such error, probably because of wrong settings.
|
||||
pass
|
||||
<<<<<<< HEAD
|
||||
|
||||
|
||||
class AutoSearchSetError(Exception):
|
||||
pass
|
||||
=======
|
||||
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
|
||||
|
||||
Reference in New Issue
Block a user