remove fr language and datas in .env

4 years ago · 2c4a29658f
2 changed files with 6316 additions and 0 deletions
--- a/hosting/.env
+++ b/hosting/.env
@ -22,4 +22,8 @@ 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)
--- a/yarn.lock
+++ b/yarn.lock