diff options
Diffstat (limited to 'roomserver/state/state.go')
| -rw-r--r-- | roomserver/state/state.go | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/roomserver/state/state.go b/roomserver/state/state.go index 9ee6f40d..0663499e 100644 --- a/roomserver/state/state.go +++ b/roomserver/state/state.go @@ -717,11 +717,7 @@ func ResolveConflictsAdhoc( // Append the events if there is already a conflicted list for // this tuple key, create it if not. tuple := stateKeyTuple{event.Type(), *event.StateKey()} - if _, ok := eventMap[tuple]; ok { - eventMap[tuple] = append(eventMap[tuple], event) - } else { - eventMap[tuple] = []gomatrixserverlib.Event{event} - } + eventMap[tuple] = append(eventMap[tuple], event) } // Split out the events in the map into conflicted and unconflicted |