fixed conflict

This commit is contained in:
Rahul Somasundaram
2022-10-04 08:38:51 +05:30
4 changed files with 33 additions and 2 deletions

View File

@@ -383,6 +383,7 @@ func initWeb(args options, clientBuildFS fs.FS) (web *Web, err error) {
clientBetaFS: clientBetaFS,
serveHTTP3: config.DNS.ServeHTTP3,
tlsCiphers: config.TLS.TLSCiphers,
}
web = newWeb(&webConf)