From cc0d69ec811cebc30cbafe5fff5c90190ee4e818 Mon Sep 17 00:00:00 2001
From: Till Faelligen <2353100+S7evinK@users.noreply.github.com>
Date: Wed, 7 Sep 2022 18:32:43 +0200
Subject: [PATCH] Fix duplicate fields/imports

---
 setup/base/base.go | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/setup/base/base.go b/setup/base/base.go
index d0be73324..2b478e764 100644
--- a/setup/base/base.go
+++ b/setup/base/base.go
@@ -37,17 +37,13 @@ import (
 	"golang.org/x/net/http2"
 	"golang.org/x/net/http2/h2c"
 
+	"github.com/matrix-org/dendrite/internal"
 	"github.com/matrix-org/dendrite/internal/caching"
 	"github.com/matrix-org/dendrite/internal/fulltext"
 	"github.com/matrix-org/dendrite/internal/httputil"
 	"github.com/matrix-org/dendrite/internal/pushgateway"
 	"github.com/matrix-org/dendrite/internal/sqlutil"
 
-	"github.com/matrix-org/dendrite/internal"
-	"github.com/matrix-org/dendrite/internal/fulltext"
-	"github.com/matrix-org/dendrite/setup/jetstream"
-	"github.com/matrix-org/dendrite/setup/process"
-
 	"github.com/gorilla/mux"
 	"github.com/kardianos/minwinsvc"
 
@@ -62,6 +58,8 @@ import (
 	roomserverAPI "github.com/matrix-org/dendrite/roomserver/api"
 	rsinthttp "github.com/matrix-org/dendrite/roomserver/inthttp"
 	"github.com/matrix-org/dendrite/setup/config"
+	"github.com/matrix-org/dendrite/setup/jetstream"
+	"github.com/matrix-org/dendrite/setup/process"
 	userapi "github.com/matrix-org/dendrite/userapi/api"
 	userapiinthttp "github.com/matrix-org/dendrite/userapi/inthttp"
 )
@@ -94,7 +92,6 @@ type BaseDendrite struct {
 	EnableMetrics          bool
 	Fulltext               *fulltext.Search
 	startupLock            sync.Mutex
-	Fulltext               *fulltext.Search
 }
 
 const NoListener = ""