1
0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-16 04:37:44 +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

@@ -5,17 +5,10 @@ import time
from typing import Generator, List, Tuple
import requests
<<<<<<< HEAD
from deploy.Windows.config import ExecutionError
from deploy.Windows.git import GitManager
from deploy.Windows.pip import PipManager
from deploy.Windows.utils import DEPLOY_CONFIG
=======
from deploy.config import ExecutionError
from deploy.git import GitManager
from deploy.pip import PipManager
from deploy.utils import DEPLOY_CONFIG
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
from module.base.retry import retry
from module.logger import logger
from module.webui.config import DeployConfig