develop merge

front/src/Api/iframe/Navigation.ts

@@ -3,7 +3,7 @@ import type { OpenTabEvent } from '../Events/OpenTabEvent';
 import { IframeApiContribution, sendToWorkadventure } from './IframeApiContribution';
 import {LoadPageEvent} from "../Events/LoadPageEvent";
 
-
+import type { LoadPageEvent } from '../Events/LoadPageEvent';
 
 class WorkadventureNavigationCommands extends IframeApiContribution<WorkadventureNavigationCommands> {
 
@@ -37,7 +37,11 @@ class WorkadventureNavigationCommands extends IframeApiContribution<Workadventur
             "data" : {
                 url
             } as LoadPageEvent
+<<<<<<< Updated upstream
         },'*');
+=======
+            },'*');
+>>>>>>> Stashed changes
     }
 }