From a11cdd5a6e3ee5b531eddae32ef1ee12ee1d7939 Mon Sep 17 00:00:00 2001
From: Janet Kuo <chiachenk@google.com>
Date: Tue, 13 Dec 2016 14:02:30 -0800
Subject: [PATCH] Fix merge conflict in partners/index.html

---
 partners/index.html | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/partners/index.html b/partners/index.html
index 1b558f882e..5a8da670a9 100644
--- a/partners/index.html
+++ b/partners/index.html
@@ -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>