mirror of
https://gitee.com/sui-feng-cb/AzurLaneAutoScript1
synced 2026-03-18 03:21:29 +08:00
Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript
This commit is contained in:
@@ -9,7 +9,11 @@ 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
|
||||
|
||||
@@ -1,7 +1,11 @@
|
||||
import os
|
||||
import re
|
||||
|
||||
<<<<<<< HEAD
|
||||
from deploy.Windows.logger import logger
|
||||
=======
|
||||
from deploy.logger import logger
|
||||
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
|
||||
|
||||
BASE_FOLDER = './deploy/AidLux'
|
||||
|
||||
|
||||
Reference in New Issue
Block a user