From 5ffc0c1927ea66095f1c077338496043061b1879 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Tue, 16 Feb 2021 16:47:12 +0000 Subject: [PATCH] Fix resolve-state --- cmd/resolve-state/main.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cmd/resolve-state/main.go b/cmd/resolve-state/main.go index efa583331..69c3489d5 100644 --- a/cmd/resolve-state/main.go +++ b/cmd/resolve-state/main.go @@ -8,7 +8,6 @@ import ( "strconv" "github.com/matrix-org/dendrite/internal/caching" - "github.com/matrix-org/dendrite/roomserver/state" "github.com/matrix-org/dendrite/roomserver/storage" "github.com/matrix-org/dendrite/roomserver/types" "github.com/matrix-org/dendrite/setup" @@ -105,7 +104,7 @@ func main() { } fmt.Println("Resolving state") - resolved, err := state.ResolveConflictsAdhoc( + resolved, err := gomatrixserverlib.ResolveConflicts( gomatrixserverlib.RoomVersion(*roomVersion), events, authEvents,