fix complete manifest

2019-05-15 13:26:39 +02:00 · 2019-05-15 13:26:39 +02:00 · 9c547c91ac
parent 422d80329a
commit 9c547c91ac
1 changed files with 1 additions and 4 deletions
--- a/manifests/complete-postgres-manifest.yaml
+++ b/manifests/complete-postgres-manifest.yaml
@ -63,14 +63,11 @@ spec:
  #  uid: "efd12e58-5786-11e8-b5a7-06148230260c"
  #  cluster: "acid-batman"
  #  timestamp: "2017-12-19T12:40:33+01:00" # timezone required (offset relative to UTC, see RFC 3339 section 5.6)
-<<<<<<< HEAD
  
  # run periodic backups with k8s cron jobs
  # enableLogicalBackup: true
  # logicalBackupSchedule: "30 00 * * *"
-=======
-  #  s3_wal_path: "s3://custom/path/to/bucket"
->>>>>>> master
+  # s3_wal_path: "s3://custom/path/to/bucket"
  maintenanceWindows:
  - 01:00-06:00 #UTC
  - Sat:00:00-04:00