From f90cbe803b6e814a0491b0056b54332e7beaf8a0 Mon Sep 17 00:00:00 2001
From: lefteris <cs141082@uniwa.gr>
Date: Wed, 6 Oct 2021 17:43:13 +0300
Subject: [PATCH 1/2] final laptop change

---
 src/components/doclive/AdhocView.vue | 2 +-
 src/components/doclive/runLlo.vue    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/doclive/AdhocView.vue b/src/components/doclive/AdhocView.vue
index 32a7c75..d261fe7 100644
--- a/src/components/doclive/AdhocView.vue
+++ b/src/components/doclive/AdhocView.vue
@@ -95,7 +95,7 @@
 
         <div class="codemirror2">
           <div v-if="history" class="table3">
-            <h2>History of all app logs (redis, readmongo, dummy)</h2>
+            <h2>History of all app logs</h2>
             <vuetable
               ref="vuetable"
               :api-url="api_url"
diff --git a/src/components/doclive/runLlo.vue b/src/components/doclive/runLlo.vue
index 92cf893..337cb7b 100644
--- a/src/components/doclive/runLlo.vue
+++ b/src/components/doclive/runLlo.vue
@@ -744,7 +744,7 @@ export default {
   created() {
     //var logintoken = new URL(location.href).searchParams.get("token");
     var logintoken = new URL(
-      "https://api-client.swarmlab.io:8088/?token=9312e5629b22cfdc7c5ca027be3cc85f91bbdb58"
+      "https://api-client.swarmlab.io:8088/?token=08b677fbc99c39e100b5b64e90e1d7d77c3e3e7c"
     ).searchParams.get("token");
     this.logintoken = logintoken;
     // === We get the user + check for the token if exists

From 74aa9595e639f200965b62cae899ca81b750b6a7 Mon Sep 17 00:00:00 2001
From: lefteris <cs141082@uniwa.gr>
Date: Wed, 6 Oct 2021 17:50:07 +0300
Subject: [PATCH 2/2] staged

---
 src/components/doclive/runLlo.vue | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/components/doclive/runLlo.vue b/src/components/doclive/runLlo.vue
index 220d2e5..1b007af 100644
--- a/src/components/doclive/runLlo.vue
+++ b/src/components/doclive/runLlo.vue
@@ -752,11 +752,7 @@ export default {
   created() {
     //var logintoken = new URL(location.href).searchParams.get("token");
     var logintoken = new URL(
-<<<<<<< HEAD
       "https://api-client.swarmlab.io:8088/?token=08b677fbc99c39e100b5b64e90e1d7d77c3e3e7c"
-=======
-      "https://api-client.swarmlab.io:8088/?token=7d01aaaf1c71ab27e6041fb157c9e46077240741"
->>>>>>> b797d1044cf18e8173e1cfbe39db8c644e33ccb2
     ).searchParams.get("token");
     this.logintoken = logintoken;
     // === We get the user + check for the token if exists