wtf? I merged upstream

This commit is contained in:
naterfute
2025-04-09 22:09:51 -07:00
parent f72b1bc9cb
commit d7b4e05cf2

View File

@@ -8,13 +8,10 @@ secret_key = "${base64:48}"
[config]
env = [
<<<<<<< HEAD
"Domain=${main_domain}",
"WEB_URL=${main_domain}",
=======
"Domain=${domain}",
"WEB_URL=${Domain}",
>>>>>>> upstream/main
"PGHOST=plane-db",
"PGDATABASE=plane",
"POSTGRES_USER=${username}",