Fix: Remove leftover git conflict markers

This commit is contained in:
SysAdmin DCC 2025-12-02 09:02:19 +00:00
parent a86520c5c2
commit 6f4e457c8c
1 changed files with 1 additions and 1 deletions

View File

@ -1,6 +1,6 @@
--- ---
timezone: "Europe/Madrid" timezone: "Europe/Madrid"
HEAD
# Contraseñas Maestras (Se usan para configurar las DBs internas de cada stack) # Contraseñas Maestras (Se usan para configurar las DBs internas de cada stack)
global_db_pass: "RootSecret123" global_db_pass: "RootSecret123"
global_redis_pass: "RedisSecret123" global_redis_pass: "RedisSecret123"