From 56bb8138bf0fbb75dd2edbf1d715a52ba617014b Mon Sep 17 00:00:00 2001
From: Mike Danese <mikedanese@gmail.com>
Date: Fri, 11 Dec 2015 14:45:48 -0800
Subject: [PATCH] remove merge conflict comments

---
 pkg/conversion/scheme.go | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/pkg/conversion/scheme.go b/pkg/conversion/scheme.go
index b38857ea3b..e5ea10b50c 100644
--- a/pkg/conversion/scheme.go
+++ b/pkg/conversion/scheme.go
@@ -355,15 +355,8 @@ func (s *Scheme) ConvertToVersion(in interface{}, outGroupVersionString string)
 		return nil, err
 	}
 
-	// <<<<<<< HEAD
-	// 	if len(outVersion) != 0 {
-	// 		if err := s.SetVersionAndKind(outVersion, outKind.Kind, out); err != nil {
-	// 			return nil, err
-	// 		}
-	// =======
 	if err := s.SetVersionAndKind(outVersion.String(), outKind.Kind, out); err != nil {
 		return nil, err
-		// >>>>>>> Update ObjectTyper to GroupVersion
 	}
 
 	return out, nil