From 0156982b96b07ef5ac74947b95542ce1ab0cf1b4 Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Thu, 27 Apr 2023 14:32:48 +0100 Subject: [PATCH] fix shadowing --- roomserver/internal/query/query.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roomserver/internal/query/query.go b/roomserver/internal/query/query.go index 28b5bd95e..4bd648a9b 100644 --- a/roomserver/internal/query/query.go +++ b/roomserver/internal/query/query.go @@ -588,11 +588,11 @@ func (r *Queryer) QueryStateAndAuthChain( } if request.ResolveState { - stateEventsPDU, err := gomatrixserverlib.ResolveConflicts( + stateEventsPDU, err2 := gomatrixserverlib.ResolveConflicts( info.RoomVersion, gomatrixserverlib.ToPDUs(stateEvents), gomatrixserverlib.ToPDUs(authEvents), ) - if err != nil { - return err + if err2 != nil { + return err2 } stateEvents = gomatrixserverlib.TempCastToEvents(stateEventsPDU) }