summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--blueprints/pgaas-disk.yaml-template3
1 files changed, 0 insertions, 3 deletions
diff --git a/blueprints/pgaas-disk.yaml-template b/blueprints/pgaas-disk.yaml-template
index 65244bf..fe1bb56 100644
--- a/blueprints/pgaas-disk.yaml-template
+++ b/blueprints/pgaas-disk.yaml-template
@@ -72,12 +72,9 @@ inputs:
pgaas_cluster_name:
type: string
default: pgcl
-<<<<<<< HEAD
-=======
cinder_volume_size:
type: string
default: 300
->>>>>>> f62e307... update pgaas blueprints
node_templates:
key_pair: