From c2b0f27ac6e15f2325095a4830a35a3660d2d0c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20de=20CHAVIGNY?= Date: Tue, 6 Sep 2022 11:58:48 -0400 Subject: [PATCH] update .env --- hosting/.env | 4 ---- 1 file changed, 4 deletions(-) diff --git a/hosting/.env b/hosting/.env index 162f742eb..ab9893f33 100644 --- a/hosting/.env +++ b/hosting/.env @@ -22,8 +22,4 @@ BUDIBASE_ENVIRONMENT=PRODUCTION # An admin user can be automatically created initially if these are set BB_ADMIN_USER_EMAIL= -<<<<<<< HEAD BB_ADMIN_USER_PASSWORD= -======= -BB_ADMIN_USER_PASSWORD= ->>>>>>> parent of c95571151 (update)