fix conflicts

2022-07-22 17:17:57 +02:00
parent 5ad8d08b84
commit 38841e30b8
16 changed files with 838 additions and 180 deletions
--- a/tests/rpc/test_rpc_apiserver.py
+++ b/tests/rpc/test_rpc_apiserver.py
@@ -1403,7 +1403,8 @@ def test_api_strategies(botclient):
        'StrategyTestV2',
        'StrategyTestV3',
        'StrategyTestV3Analysis',
-        'StrategyTestV3Futures'
+        'StrategyTestV3Futures',
+        'freqai_test_strat'
    ]}