clean up merge conflict

2020-02-13 14:19:15 +01:00 · 2020-02-13 14:19:15 +01:00 · 4f2457bbe8
parent 99f2b038b5
commit 4f2457bbe8
1 changed files with 0 additions and 4 deletions
--- 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: