Merge remote-tracking branch 'origin/master'

# Conflicts:
#	signals/macd.py
This commit is contained in:
JayRen 2023-07-03 22:56:53 +08:00
commit a790c459ee
2 changed files with 2 additions and 2 deletions

View File

@ -5,7 +5,7 @@ import tg
import datetime import datetime
import setting import setting
import db import db
import signal_builder import signals.signal_builder as signal_builder
flags = {} flags = {}
def check_ema_arrange(data): def check_ema_arrange(data):

View File

@ -7,4 +7,4 @@ import signals.macd as macd
symbols = bn.symbols() symbols = bn.symbols()
for s in symbols: for s in symbols:
macd.run(s, '1h') macd.run(s, '15m')