Resolve merge conflicts in multiple files and clean up integration logic

2026-09-09 16:22:59 +02:00
parent 8f191f5123
commit 4cb94d3897
6 changed files with 5 additions and 100 deletions
@@ -1,7 +1,6 @@
 # MariaDB Verbinding
 DB_HOST="192.168.2.33"
 DB_PORT="3306"
-<<<<<<< HEAD
 DB_NAME="focizdev"
 DB_USER="focizdev_user"
 DB_PASS="F0c1z_Dev_Secure_2026!"
@@ -11,17 +10,6 @@ APP_ENV="development"

 # Applicatie URL (voor uitnodigingslinks en OAuth redirects: https://dev.fociz.nl of https://fociz.nl)
 APP_URL="https://dev.fociz.nl"
-=======
-DB_NAME="fociz"
-DB_USER="focizlive_user"
-DB_PASS="F0c1z_Live_Secure_2026!"
-
-# Omgeving: 'development' (knippert rood) of 'live' (knippert groen)
-APP_ENV="live"
-
-# Applicatie URL (voor uitnodigingslinks en OAuth redirects: https://dev.fociz.nl of https://fociz.nl)
-APP_URL="https://www.fociz.nl"
->>>>>>> dd738e670b78819c11e329da93db1b472808f195

 # Applicatie Geheime Sleutel (willekeurige tekenreeks)
 APP_SECRET="fociz-maria-db-super-secret-key-998877"