Skip to content

K
k3s
Commit 56bb8138 authored by Mike Danese's avatar Mike Danese
Browse files
Options

remove merge conflict comments

parent 775369a8
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 7 deletions
pkg/conversion/scheme.go
View file @ 56bb8138
...@@ -355,15 +355,8 @@ func (s *Scheme) ConvertToVersion(in interface{}, outGroupVersionString string) ...@@ -355,15 +355,8 @@ func (s *Scheme) ConvertToVersion(in interface{}, outGroupVersionString string)
return nil, err 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 { if err := s.SetVersionAndKind(outVersion.String(), outKind.Kind, out); err != nil {
return nil, err return nil, err
// >>>>>>> Update ObjectTyper to GroupVersion
} }
return out, nil return out, nil
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment