|
|
@@ -15,11 +15,8 @@ serde_derive = "1.0.183"
|
|
|
serde_json = "1.0.104"
|
|
|
ndarray = "0.15"
|
|
|
time = "0.2"
|
|
|
-<<<<<<< HEAD
|
|
|
binance = { git = "https://github.com/wisespace-io/binance-rs.git" }
|
|
|
tokio = {version = "1.31.0", features = ["full"] }
|
|
|
-=======
|
|
|
-tokio = { version = "1.31.0", features = ["full"] }
|
|
|
|
|
|
tungstenite = { git = "https://github.com/PrivateRookie/tungstenite-rs.git", rev = "1d9289276518e5ab7e5194126d40b441d8938375" }
|
|
|
url = "2.4.0"
|
|
|
@@ -30,4 +27,4 @@ base64 = "0.13"
|
|
|
#sha2 = "0.9"
|
|
|
hex = "0.4"
|
|
|
ring = "0.17.0-alpha.11"
|
|
|
->>>>>>> 0fbf9435eeade0a1837b91e7976f703dcaad7604
|
|
|
+
|
JiahengHe