From 583fbbef3ce714bdc4b3130b74620f79873119bb Mon Sep 17 00:00:00 2001 From: v-mingzhehan Date: Tue, 22 Jun 2021 07:07:19 +0000 Subject: [PATCH] Resolve init conflict --- qlib/backtest/__init__.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/qlib/backtest/__init__.py b/qlib/backtest/__init__.py index 107f97782..ae07cdbdf 100644 --- a/qlib/backtest/__init__.py +++ b/qlib/backtest/__init__.py @@ -7,15 +7,9 @@ from .exchange import Exchange from .executor import BaseExecutor from .backtest import backtest_loop from .backtest import collect_data_loop -<<<<<<< HEAD from .order import Order from .utils import CommonInfrastructure, TradeCalendarManager -======= -from .utils import CommonInfrastructure -from .order import Order - ->>>>>>> ab97e8248443789ce1e0f90a9b5596e5fee60566 from ..strategy.base import BaseStrategy from ..utils import init_instance_by_config from ..log import get_module_logger