@@ -14,11 +14,8 @@ print(type(stock_pool),stock_pool)
print(item for item in stock_pool)
# 22
# 11
-<<<<<<< HEAD
# 1234
-=======
# 33
->>>>>>> a095f4969109e4e802a0c7a69b2a548d22688ca6
# futures = ['IF9999.CCFX', 'IC9999.CCFX','IH9999.CCFX', 'IM9999.CCFX', 'FU9999.XSGE', 'RB9999.XSGE', 'MA9999.XZCE', 'TA9999.XZCE', 'SA9999.XZCE', 'M9999.XDCE', 'LH9999.XDCE']
