mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-16 11:23:11 -06:00
Code Issues Packages Projects Releases Wiki Activity

whoops compile error

Browse source
This commit is contained in:
Neil Alexander 2020-03-06 13:58:00 +00:00
parent adf2726f20
commit 16365357b7
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
roomserver/state/state.go
View file

@ -695,7 +695,7 @@ func (v StateResolution) resolveConflictsV2(
notConflicted, conflicted []types.StateEntry,
) ([]types.StateEntry, error) {
var eventIDMap map[string]StateEntry
var eventIDMap map[string]types.StateEntry
// Load the conflicted events
conflictedEvents, conflictedEventMap, err := v.loadStateEvents(ctx, conflicted)