From 3867bf4045cadad2ef12c304086330cb8464bf04 Mon Sep 17 00:00:00 2001
From: TerenceLiu98 <terenceliu1012@gmail.com>
Date: Sat, 29 May 2021 18:46:16 +0800
Subject: [PATCH] update

---
 CEDA/Market/market.py | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/CEDA/Market/market.py b/CEDA/Market/market.py
index 0721206..9370def 100644
--- a/CEDA/Market/market.py
+++ b/CEDA/Market/market.py
@@ -47,18 +47,9 @@ 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