Tino 5 сар өмнө
parent
commit
c40c54c763

+ 0 - 5
Consola/env-prod-configmap.yaml

@@ -1,13 +1,8 @@
 apiVersion: v1
 data:
   DEBUG: "False"
-<<<<<<< HEAD
-#  SQL_HOST: postgres-cluster-rw.reymota-pg-cluster.svc.cluster.local
-  SQL_HOST: postgres-cluster-rw.reymota-pg-cluster.svc.cluster.local
-=======
   SQL_HOST: postgres-cluster-rw.reymota-pg-cluster.svc.cluster.local
   # SQL_HOST: k8s-postgres-cluster-rw.k8s-pg-cluster.svc.cluster.local
->>>>>>> ec98923ba03fefd2d002586f609d5217eeb7cd23
   SQL_PORT: "5432"
   DATABASE: postgres
 kind: ConfigMap