fix merge conflict in quickstart.sh

jmccormick2001 · jmccormick2001 · commit 89fef9fc325c · 2019-01-23T14:42:55.000-05:00
diff --git a/conf/postgres-operator/pgo.yaml b/conf/postgres-operator/pgo.yaml
@@ -4,7 +4,7 @@ Cluster:
   CCPImagePrefix:  crunchydata
   Metrics:  false
   Badger:  false
-  CCPImageTag:  centos7-11.1-2.3.0
+  CCPImageTag:  centos7-11.1-2.3.0-rc6
   Port:  5432
   User:  testuser
   Database:  userdb
diff --git a/examples/quickstart.sh b/examples/quickstart.sh
@@ -219,6 +219,7 @@ read REPLY
 export STORAGE_CLASS=$REPLY
 
 echo ""
+
 echo "Configuring pgo.yaml file..."
 cp $COROOT/deploy/cluster-rbac.yaml $COROOT/deploy/cluster-rbac.yaml.bak
 expenv -f $COROOT/deploy/cluster-rbac.yaml > /tmp/cluster-rbac.yaml
