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

@@ -9,11 +9,7 @@ jellyfish==0.11.2
lz4
mxnet==1.6.0
numpy
<<<<<<< HEAD
onepush
=======
onepush==1.3.0
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
pillow
prettytable==2.2.1
psutil==5.9.3

View File

@@ -1,11 +1,7 @@
import os
import re
<<<<<<< HEAD
from deploy.Windows.logger import logger
=======
from deploy.logger import logger
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
BASE_FOLDER = './deploy/AidLux'