whentimeslows/website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove merge conflict #13941 (#13942)

Browse Source
This commit is contained in:
Milo Hartsoe
2019-04-21 20:37:43 -04:00
committed by Kubernetes Prow Robot
parent 0311519fd2
commit 5ce09cd01c
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
content/en/docs/setup/pick-right-solution.md
-4
View File
@@ -165,12 +165,8 @@ few commands.
* [Docker Enterprise](https://www.docker.com/products/docker-enterprise) * [Docker Enterprise](https://www.docker.com/products/docker-enterprise)
* [Giant Swarm](https://giantswarm.io) * [Giant Swarm](https://giantswarm.io)
* [GKE On-Prem | Google Cloud](https://cloud.google.com/gke-on-prem/) * [GKE On-Prem | Google Cloud](https://cloud.google.com/gke-on-prem/)
<<<<<<< HEAD
* [IBM Cloud Private](https://www.ibm.com/cloud-computing/products/ibm-cloud-private/)
* [k3s](https://k3s.io) * [k3s](https://k3s.io)
=======
* [IBM Cloud Private](https://www.ibm.com/cloud/private) * [IBM Cloud Private](https://www.ibm.com/cloud/private)
>>>>>>> upstream/master
* [Kontena Pharos](https://kontena.io/pharos/) * [Kontena Pharos](https://kontena.io/pharos/)
* [Kubermatic](https://www.loodse.com) * [Kubermatic](https://www.loodse.com)
* [Kublr](https://kublr.com/) * [Kublr](https://kublr.com/)