debu

VladKochetov007 · Dec 23, 2020 · c1e3486 · c1e3486
1 parent 2fb54c7
commit c1e3486
Showing 1 changed file with 0 additions and 14 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 iexfinance==0.5.0
 plotly==4.14.1
 pykalman==0.9.5
@@ -10,16 +9,3 @@ ta==0.7.0
 scipy==1.5.4
 scikit-learn==0.23.2
 tensorflow==2.4.0
-=======
-iexfinance==0.4.3
-plotly==4.13.0
-ta==0.7.0
-scikit-learn==0.23.2
-tensorflow==2.3.1
-pykalman==0.9.5
-scipy==1.5.4
-numpy==1.19.4
-pandas==1.1.4
-python-binance==0.7.5
-requests==2.25.0
->>>>>>> c3917e9a68b69a94be528a191db94e69d2960eea