Merge branch 'stable' into develop

askmike · Oct 1, 2017 · fa10ccb · fa10ccb
2 parents df7b749 + 20599af
commit fa10ccb
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/exchanges/bitfinex.js b/exchanges/bitfinex.js
@@ -190,7 +190,7 @@ Trader.prototype.getTrades = function(since, callback, descending) {
   if(since) 
     path += '?limit_trades=2000'; 
 
-  this.bitfinex.trades(path, (err, data) => {  
+  this.bitfinex.trades(path, (err, data) => {
     if (err)
       return this.retry(this.getTrades, args);
 

diff --git a/exchanges/kraken.js b/exchanges/kraken.js
@@ -445,4 +445,4 @@ Trader.getCapabilities = function () {
   };
 }
 
-module.exports = Trader;
+module.exports = Trader;
diff --git a/strategies/PPO.js b/strategies/PPO.js
@@ -8,7 +8,7 @@
 
 // helpers
 var _ = require('lodash');
-var log = require('../core/log.js');
+var log = require('../core/log');
 
 // let's create our own method
 var method = {};