update

2021-05-29 18:31:53 +08:00 · 2021-05-29 18:31:53 +08:00 · cd9ea45b19
parent e819b9d4de ba530b253b
commit cd9ea45b19
2 changed files with 13 additions and 0 deletions
--- a/CEDA/Market/market.py
+++ b/CEDA/Market/market.py
@ -47,9 +47,18 @@ def market_data(

 if __name__ == "__main__":
    data = market_data(instrument="eurusd",
+<<<<<<< HEAD
                       startdate="2020-01-01",
                       enddate="2021-01-01",
                       timeframe="d1",
                       pricetype="bid",
                       volume=True,
                       flat=True)
+=======
+                        startdate="2020-01-01",
+                        enddate="2021-01-01",
+                        timeframe="d1",
+                        pricetype="bid",
+                        volume=True,
+                        flat=True)
+>>>>>>> master
--- a/setup.py
+++ b/setup.py
@ -2,7 +2,11 @@ from setuptools import setup, find_packages
 import os
 setup(
    name = "CEDApy",
+<<<<<<< HEAD
    version = "1.0.3",
+=======
+    version = "1.0.3",
+>>>>>>> master
    keywords = "quantitative economic data",
    long_description = open(
    os.path.join(