mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-09-12 12:48:51 +00:00
Merge pull request #18602 from mikedanese/merge-conflict
Auto commit by PR queue bot
This commit is contained in:
@@ -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
|
||||
|
Reference in New Issue
Block a user