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

Fix merge conflict in partners/index.html

Browse Source
This commit is contained in:
Janet Kuo
2016-12-13 14:02:30 -08:00
parent 9117f7a9ac
commit a11cdd5a6e
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
partners/index.html
+1 -5
View File
@@ -14,11 +14,7 @@ title: Partners
<section id="users"> <section id="users">
<main> <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. 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>
<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.
<h3>Technology Partners</h3> <h3>Technology Partners</h3>
<div id="isvContainer"></div> <div id="isvContainer"></div>
<h3>Services Partners</h3> <h3>Services Partners</h3>