Merge branch 'master' of git.swarmlab.io:Lefteris/playground-client

src/components/doclive/runLlo.vue

@@ -39,17 +39,13 @@
                 >Output</label
               >
             </div>
-
-            
           </div>
         </div>
       </div>
       <!-- col -->
 
       <div class="col-6">
-        <div class="input-group input-group-sm sm-6">
-          
-        </div>
+        <div class="input-group input-group-sm sm-6"></div>
       </div>
       <!-- col -->
     </div>
@@ -134,7 +130,6 @@
     <!-- row -->
 
     <div class="row rowlog overflow-auto">
-      
       <!-- col -->
       <div v-show="onEvent" class="logs">
         <h2>ON-event logs for all apps (Simplified - ALL)</h2>
@@ -689,11 +684,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=de10ccdc027cd26161b3c1923098e436d56882f0"
-=======
-      "https://api-client.swarmlab.io:8088/?token=1e46b03ddd79f1237404a5e4c5dd487b21f98b1f"
->>>>>>> 1abf5ff1b2cc53fd25c04f5da828d402fe2a9f9a
     ).searchParams.get("token");
     this.logintoken = logintoken;
     // === We get the user + check for the token if exists