From 7fc31eee667d05f990689e2fad5f2635e1ca0f45 Mon Sep 17 00:00:00 2001 From: Mark Haines Date: Tue, 14 Feb 2017 13:41:22 +0000 Subject: [PATCH] spelling --- src/github.com/matrix-org/dendrite/roomserver/input/state.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/github.com/matrix-org/dendrite/roomserver/input/state.go b/src/github.com/matrix-org/dendrite/roomserver/input/state.go index 7701a7a62..9b9026f52 100644 --- a/src/github.com/matrix-org/dendrite/roomserver/input/state.go +++ b/src/github.com/matrix-org/dendrite/roomserver/input/state.go @@ -158,7 +158,7 @@ func calculateAndStoreStateMany(db RoomEventDatabase, roomNID types.RoomNID, pre return db.AddState(roomNID, nil, state) } -func resolveConflicts(db RoomEventDatabase, combinded, conflicted []types.StateEntry) ([]types.StateEntry, error) { +func resolveConflicts(db RoomEventDatabase, combined, conflicted []types.StateEntry) ([]types.StateEntry, error) { panic(fmt.Errorf("Not implemented")) }