MirrorHub/dendrite
0
0
Fork 0
mirror of https://github.com/matrix-org/dendrite synced 2025-04-30 06:54:07 +02:00
Code Issues Releases Wiki Activity

Resolve merge conflicts and remove unused files

Browse source
This commit is contained in:
eyedeekay 2024-09-13 14:45:02 -04:00
commit a9da770aeb
No known key found for this signature in database
GPG key ID: D75C03B39B5E14E1
1 changed files with 1 additions and 1 deletions

2
setup/base/base.go
View file

@ -52,6 +52,7 @@ var staticContent embed.FS
//go:embed static/client/login
var loginFallback embed.FS
var StaticContent = staticContent
const HTTPServerTimeout = time.Minute * 5
@ -235,7 +236,6 @@ func SetupAndServeHTTP(
logrus.WithError(err).Fatal("failed to serve unix socket")
}
}
} else {
if err := externalServ.ListenAndServe(); err != nil {
if err != http.ErrServerClosed {