diff options
author | Emma [it/its]@Rory& <root@rory.gay> | 2024-03-22 17:45:19 +0100 |
---|---|---|
committer | Emma [it/its]@Rory& <root@rory.gay> | 2024-03-22 17:45:19 +0100 |
commit | fc3d89ad7422dedb8763783c6ebb5d70fcc2c536 (patch) | |
tree | d46e22858059b76e8968704926d8f4685853be30 /Tests/LibMatrix.HomeserverEmulator/Controllers/Rooms/RoomStateController.cs | |
parent | Changes (diff) | |
download | LibMatrix-fc3d89ad7422dedb8763783c6ebb5d70fcc2c536.tar.xz |
Fix merge conficts between machines
Diffstat (limited to 'Tests/LibMatrix.HomeserverEmulator/Controllers/Rooms/RoomStateController.cs')
-rw-r--r-- | Tests/LibMatrix.HomeserverEmulator/Controllers/Rooms/RoomStateController.cs | 2 |
1 files changed, 1 insertions, 1 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 |