From: Tony Hansen <tony@att.com>
Date: Tue, 10 Oct 2017 13:39:42 +0000 (+0000)
Subject: fix merge conflict
X-Git-Tag: 1.0.0-Amsterdam~50
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F59%2F17959%2F1;p=dcaegen2%2Fplatform%2Fblueprints.git

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
--- 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: