From 7a1f74e53de212de4c01ea924c411901bf30a372 Mon Sep 17 00:00:00 2001 From: Matias Benitez Date: Thu, 7 Jun 2018 16:16:54 -0300 Subject: [PATCH] Merging code --- Multi-Period-Daily/User.bot.js | 1 + 1 file changed, 1 insertion(+) diff --git a/Multi-Period-Daily/User.bot.js b/Multi-Period-Daily/User.bot.js index c2b3b8d59..e39d563f5 100644 --- a/Multi-Period-Daily/User.bot.js +++ b/Multi-Period-Daily/User.bot.js @@ -104,6 +104,7 @@ LRCIndicator.prototype.calculate = function (price) { } exports.newUserBot = function newUserBot(BOT, COMMONS, UTILITIES, DEBUG_MODULE, BLOB_STORAGE) { +<<<<<<< HEAD const FULL_LOG = true; ======= const FULL_LOG = false;