From fc3d89ad7422dedb8763783c6ebb5d70fcc2c536 Mon Sep 17 00:00:00 2001
From: "Emma [it/its]@Rory&" <root@rory.gay>
Date: Fri, 22 Mar 2024 17:45:19 +0100
Subject: Fix merge conficts between machines

---
 .../Controllers/Rooms/RoomStateController.cs                            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Tests/LibMatrix.HomeserverEmulator/Controllers/Rooms')

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
-- 
cgit 1.4.1