Fix merge conficts between machines

2 files changed, 2 insertions, 2 deletions

diff --git a/Tests/LibMatrix.HomeserverEmulator/Controllers/Rooms/RoomStateController.cs b/Tests/LibMatrix.HomeserverEmulator/Controllers/Rooms/RoomStateController.cs

index 46c3062..cb5f213 100644
--- a/Tests/LibMatrix.HomeserverEmulator/Controllers/Rooms/RoomStateController.cs
+++ b/Tests/LibMatrix.HomeserverEmulator/Controllers/Rooms/RoomStateController.cs
@@ -102,7 +102,7 @@ public class RoomStateController(ILogger<RoomStateController> logger, TokenServi
         evt.Type = eventType;
         evt.StateKey = stateKey;
         return new EventIdResponse(){
-            EventId = evt.EventId
+            EventId = evt.EventId ?? throw new InvalidOperationException("EventId is null")
         };
     }
 }
\ No newline at end of file
diff --git a/Tests/TestDataGenerator/Program.cs b/Tests/TestDataGenerator/Program.cs

index 5c20958..2583817 100644
--- a/Tests/TestDataGenerator/Program.cs
+++ b/Tests/TestDataGenerator/Program.cs
@@ -19,7 +19,7 @@ var host = Host.CreateDefaultBuilder(args).ConfigureServices((_, services) => {
     services.AddSingleton<AppServiceConfiguration>();
 
     services.AddRoryLibMatrixServices();
-    services.AddBot(false);
+    services.AddMatrixBot();//.AddCommandHandler().AddCommands([typeof()]);
 
     services.AddHostedService<DataFetcher>();
 }).UseConsoleLifetime().Build();