staged

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