Update conformance results for v1.26/ibm-openshift (cncf#2711)

Red Hat OpenShift on IBM Cloud conformance results updated for version 4.13.5.

Signed-off-by: Richard Theis <rtheis@us.ibm.com>

v1.26/ibm-openshift/PRODUCT.yaml

@@ -1,10 +1,14 @@
 vendor: IBM
 name: Red Hat OpenShift on IBM Cloud
 <<<<<<< HEAD
+<<<<<<< HEAD
 version: 4.13.5
 =======
 version: 4.13.0
 >>>>>>> Conformance results for v1.26/ibm-openshift (#2662)
+=======
+version: 4.13.5
+>>>>>>> Update conformance results for v1.26/ibm-openshift (#2711)
 website_url: https://www.ibm.com/cloud/openshift
 documentation_url: https://cloud.ibm.com/docs/openshift
 product_logo_url: https://raw.githubusercontent.com/ibm-cloud-docs/openshift/master/images/logo-red-hat-openshift-on-ibm-cloud-light.svg

v1.26/ibm-openshift/README.md

@@ -27,10 +27,14 @@ $ ibmcloud oc cluster create vpc-gen2 --name conformance --version 4.13_openshif
 Go to [IBM Cloud catalog](https://cloud.ibm.com/catalog?category=containers#services)
 and select `Red Hat OpenShift on IBM Cloud` to create a cluster. From the
 <<<<<<< HEAD
+<<<<<<< HEAD
 cluster creation UI, select version 4.13.5 and choose either classic or VPC
 =======
 cluster creation UI, select version 4.13.0 and choose either classic or VPC
 >>>>>>> Conformance results for v1.26/ibm-openshift (#2662)
+=======
+cluster creation UI, select version 4.13.5 and choose either classic or VPC
+>>>>>>> Update conformance results for v1.26/ibm-openshift (#2711)
 infrastructure. Then choose an appropriate location and worker pool configuration.
 Finally, give the cluster a name, such as `conformance`, and select `Create`.