From 9c547c91ac9cfc83a1c2c2434eeb2aaec2335c8f Mon Sep 17 00:00:00 2001
From: Sergey Dudoladov <sergey.dudoladov@zalando.de>
Date: Wed, 15 May 2019 13:26:39 +0200
Subject: [PATCH] fix complete manifest

---
 manifests/complete-postgres-manifest.yaml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/manifests/complete-postgres-manifest.yaml b/manifests/complete-postgres-manifest.yaml
index 07e4f8308..8c5873e83 100644
--- 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