diff options
author | Emma [it/its]@Rory& <root@rory.gay> | 2023-12-01 12:16:00 +0100 |
---|---|---|
committer | Emma [it/its]@Rory& <root@rory.gay> | 2023-12-01 12:16:00 +0100 |
commit | 71d115dc8e915a620dd935955ba980fcbe421dad (patch) | |
tree | b836f5b0e1b5955bbc08443f8df6d078bd0fa7ea /LibMatrix/Helpers/SyncStateResolver.cs | |
parent | Moderation bot work (diff) | |
download | LibMatrix-71d115dc8e915a620dd935955ba980fcbe421dad.tar.xz |
Cleanup, move ArcaneLibs to submodule instead of parent submodule
Diffstat (limited to 'LibMatrix/Helpers/SyncStateResolver.cs')
-rw-r--r-- | LibMatrix/Helpers/SyncStateResolver.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/LibMatrix/Helpers/SyncStateResolver.cs b/LibMatrix/Helpers/SyncStateResolver.cs index 0070d60..3482be3 100644 --- a/LibMatrix/Helpers/SyncStateResolver.cs +++ b/LibMatrix/Helpers/SyncStateResolver.cs @@ -74,7 +74,7 @@ public class SyncStateResolver(AuthenticatedHomeserverGeneric homeserver, ILogge return oldState; } -#region Merge rooms + #region Merge rooms private SyncResponse.RoomsDataStructure MergeRoomsDataStructure(SyncResponse.RoomsDataStructure oldState, SyncResponse.RoomsDataStructure newState) { oldState.Join ??= new(); @@ -170,5 +170,5 @@ public class SyncStateResolver(AuthenticatedHomeserverGeneric homeserver, ILogge return oldData; } -#endregion + #endregion } |