From 404e1d9c3f96b1c246f1145ac6d5db31a2676611 Mon Sep 17 00:00:00 2001 From: Expand-sys Date: Wed, 9 Jun 2021 18:09:36 +1000 Subject: [PATCH] fuck you git --- index.js | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/index.js b/index.js index 2c2902b..de1221b 100644 --- a/index.js +++ b/index.js @@ -210,19 +210,8 @@ app.get("/BankF", ensureAuthenticated, async function (req, res) { logsent = logsent.body.value; let logrec = logsent; let graphlog = logsent; -<<<<<<< HEAD graphlog = graphlog.reverse(); let graphdata = ""; -======= - try { - graphlog = graphlog.reverse(); - } catch (e) { - console.log(e); - } - - console.log(graphlog); - let graphdata = '["transaction", "balance"]'; ->>>>>>> 46b738e61c02b533989bdb6c9cae1f9d6a9bb4a6 let currentbal = balance.value; if (graphlog) { for (i = graphlog.length - 1; i > -1; i--) { @@ -237,15 +226,11 @@ app.get("/BankF", ensureAuthenticated, async function (req, res) { } else { graphlog = undefined; } -<<<<<<< HEAD graphdata = ", [" + parseInt(graphlog.length) + "," + balance.value + "]" + graphdata; console.log(balance); graphdata = '["transaction", "balance"]' + graphdata; console.log(JSON.stringify(graphdata)); -======= - ->>>>>>> 46b738e61c02b533989bdb6c9cae1f9d6a9bb4a6 if (logsent == 1 || logsent == -1 || logsent == null) { logsent = undefined; } else {