From 4f2457bbe8f4a776156183027aa83ac5183c2d5e Mon Sep 17 00:00:00 2001
From: Felix Kunde <felix-kunde@gmx.de>
Date: Thu, 13 Feb 2020 14:19:15 +0100
Subject: [PATCH] clean up merge conflict

---
 manifests/operatorconfiguration.crd.yaml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/manifests/operatorconfiguration.crd.yaml b/manifests/operatorconfiguration.crd.yaml
index 463bdc2a6..1c4443ba3 100644
--- a/manifests/operatorconfiguration.crd.yaml
+++ b/manifests/operatorconfiguration.crd.yaml
@@ -303,11 +303,7 @@ spec:
                 connection_pool_user:
                   type: string
                   #default: "pooler"
-<<<<<<< HEAD
                 connection_pool_replicas:
-=======
-                connection_pool_instances_number:
->>>>>>> 2384e1ec10638e1989c0295ffb7fbe96af2e2f1a
                   type: integer
                   #default: 1
                 connection_pool_image: