fixed merge conflicts

This commit is contained in:
Ermal Guni
2018-08-09 23:46:37 +02:00
58 changed files with 13581 additions and 2062 deletions

View File

@@ -120,6 +120,7 @@ func (o *OKEX) Setup(exch config.ExchangeConfig) {
o.AuthenticatedAPISupport = exch.AuthenticatedAPISupport
o.SetAPIKeys(exch.APIKey, exch.APISecret, exch.ClientID, false)
o.SetHTTPClientTimeout(exch.HTTPTimeout)
o.SetHTTPClientUserAgent(exch.HTTPUserAgent)
o.RESTPollingDelay = exch.RESTPollingDelay
o.Verbose = exch.Verbose
o.Websocket = exch.Websocket