From 2610c74cd400cdb5c0d5bafbd7b373c3bae03b62 Mon Sep 17 00:00:00 2001 From: Expand-sys Date: Fri, 11 Jun 2021 09:36:21 +1000 Subject: [PATCH] getting rid of garbage --- index.js | 9 --------- 1 file changed, 9 deletions(-) diff --git a/index.js b/index.js index ffee0b9..277f612 100644 --- a/index.js +++ b/index.js @@ -215,10 +215,7 @@ app.get("/BankF", ensureAuthenticated, async function (req, res) { if (graphlog != null) { graphlog = graphlog.reverse(); } -<<<<<<< HEAD -======= console.log(graphlog); ->>>>>>> 0632ce5d3013197f52c2a2ffa69b5bd940da7817 let graphdata = ""; let currentbal = balance.value; if (graphlog != null) { @@ -239,19 +236,13 @@ app.get("/BankF", ensureAuthenticated, async function (req, res) { } else { graphlog = undefined; } -<<<<<<< HEAD if (graphdata != "") { graphdata = ", [" + parseInt(graphlog.length) + "," + balance.value + "]" + graphdata; graphdata = '["transaction", "balance"]' + graphdata; } - console.log(balance); - console.log(JSON.stringify(graphdata)); -======= - ->>>>>>> 0632ce5d3013197f52c2a2ffa69b5bd940da7817 if (logsent == 1 || logsent == -1 || logsent == null) { logsent = undefined; } else {