Fix: Remove leftover git conflict markers
This commit is contained in:
parent
a86520c5c2
commit
6f4e457c8c
|
|
@ -1,6 +1,6 @@
|
|||
---
|
||||
timezone: "Europe/Madrid"
|
||||
HEAD
|
||||
|
||||
# Contraseñas Maestras (Se usan para configurar las DBs internas de cada stack)
|
||||
global_db_pass: "RootSecret123"
|
||||
global_redis_pass: "RedisSecret123"
|
||||
|
|
|
|||
Loading…
Reference in New Issue