fix merge conflict

Change-Id: Id2a0760f7ca940646c9c42cd3cef497b4d579503
Signed-off-by: Tony Hansen <tony@att.com>
Issue-ID: DCAEGEN2-128

diff --git a/blueprints/pgaas-disk.yaml-template b/blueprints/pgaas-disk.yaml-template
index 65244bf..fe1bb56 100644 (file)
--- 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: