Merge pull request #18602 from mikedanese/merge-conflict

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-12-14 13:57:20 -08:00

View File

@@ -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