change log: delete Merge Conflict Marker in trkd_interday.py

Wasin Waeosri · Wasin Waeosri · commit f17f6412ecce · 2017-09-07T16:04:39.000+07:00
diff --git a/trkd_interday.py b/trkd_interday.py
@@ -74,10 +74,7 @@ def RetrieveInteraday(token, appid):
         }
     }
     ##construct Time Series Interday URL and header
-<<<<<<< HEAD
-=======
     #interdayURL = 'http://api.rkd.reuters.com/api/TimeSeries/TimeSeries.svc/REST/TimeSeries_1/GetInterdayTimeSeries_4'
->>>>>>> v14_python3
     interdayURL = 'http://api.trkd.thomsonreuters.com/api/TimeSeries/TimeSeries.svc/REST/TimeSeries_1/GetInterdayTimeSeries_4'
     headers = {'content-type': 'application/json;charset=utf-8' ,'X-Trkd-Auth-ApplicationID': appid, 'X-Trkd-Auth-Token' : token}
     

Original file line number	Diff line number	Diff line change
`@@ -74,10 +74,7 @@ def RetrieveInteraday(token, appid):`
`74`	`74`	`}`
`75`	`75`	`}`
`76`	`76`	`##construct Time Series Interday URL and header`
`77`		`-<<<<<<< HEAD`
`78`		`-=======`
`79`	`77`	`#interdayURL = 'http://api.rkd.reuters.com/api/TimeSeries/TimeSeries.svc/REST/TimeSeries_1/GetInterdayTimeSeries_4'`
`80`		`->>>>>>> v14_python3`
`81`	`78`	`interdayURL = 'http://api.trkd.thomsonreuters.com/api/TimeSeries/TimeSeries.svc/REST/TimeSeries_1/GetInterdayTimeSeries_4'`
`82`	`79`	`headers = {'content-type': 'application/json;charset=utf-8' ,'X-Trkd-Auth-ApplicationID': appid, 'X-Trkd-Auth-Token' : token}`
`83`	`80`