fix merge

f0ssel · f0ssel · commit c92cc65b375e · 2022-10-18T01:43:51.000Z
diff --git a/cli/server.go b/cli/server.go
@@ -306,20 +306,14 @@ func Server(vip *viper.Viper, newAPI func(context.Context, *coderd.Options) (*co
 				return xerrors.Errorf("create derp map: %w", err)
 			}
 
-<<<<<<< HEAD
-			appHostname := strings.TrimSpace(dflags.WildcardAccessURL.Value)
+			appHostname := strings.TrimSpace(cfg.WildcardAccessURL)
 			var appHostnameRegex *regexp.Regexp
 			if appHostname != "" {
 				appHostnameRegex, err = httpapi.CompileHostnamePattern(appHostname)
 				if err != nil {
 					return xerrors.Errorf("parse wildcard access URL %q: %w", appHostname, err)
 				}
 			}
-=======
-			appHostname := strings.TrimPrefix(cfg.WildcardAccessURL, "http://")
-			appHostname = strings.TrimPrefix(appHostname, "https://")
-			appHostname = strings.TrimPrefix(appHostname, "*.")
->>>>>>> idk
 
 			options := &coderd.Options{
 				AccessURL:                   accessURLParsed,
