kubernetes
/
website
mirror of https://github.com/kubernetes/website.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1946 from janetkuo/fix-merge-conflicts 

Fix merge conflict in partners/index.html
reviewable/pr1935/r1^2
Steve Perry 2016-12-13 14:09:10 -08:00 committed by GitHub
parent 9117f7a9ac a11cdd5a6e
commit 4edb86eb4c
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
partners/index.html
View File

@ -14,11 +14,7 @@ title: Partners
<section id="users">
<main>
<<<<<<< HEAD
<h5>We are working with a broad group of partners who contribute to the Kubernetes core codebase, making it stronger and richer. These partners create a vibrant Kubernetes ecosystem supporting a spectrum of complementing platforms, from open source solutions to market-leading technologies.</h5>
=======
<h5>We are working with a broad group of partners who contribute to the Kubernetes core codebase, making it stronger and richer. There partners create a vibrant Kubernetes ecosystem supporting a spectrum of complementing platforms, from open source solutions to market-leading technologies. Partners can get their services and offerings added to this page by completing and submitting the <a href="https://goo.gl/qcSnZF">partner request form</a>.</h5>
>>>>>>> ebaa392... Addressed comments by jaredbhatti.
<h5>We are working with a broad group of partners who contribute to the Kubernetes core codebase, making it stronger and richer. These partners create a vibrant Kubernetes ecosystem supporting a spectrum of complementing platforms, from open source solutions to market-leading technologies. Partners can get their services and offerings added to this page by completing and submitting the <a href="https://goo.gl/qcSnZF">partner request form</a>.</h5>
<h3>Technology Partners</h3>
<div id="isvContainer"></div>
<h3>Services Partners</h3>