mirror of
https://gitee.com/sui-feng-cb/AzurLaneAutoScript1
synced 2026-03-13 12:37:01 +08:00
merge alas
This commit is contained in:
@@ -1,11 +1,5 @@
|
||||
# This must be the first to import
|
||||
from module.logger import logger # Change folder
|
||||
<<<<<<< HEAD
|
||||
import deploy.Windows.logger
|
||||
|
||||
deploy.Windows.logger.logger = logger
|
||||
=======
|
||||
import deploy.logger
|
||||
|
||||
deploy.logger.logger = logger
|
||||
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
|
||||
|
||||
Reference in New Issue
Block a user