github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

remove merge conflict comments

pull/6/head
Mike Danese 2015-12-11 14:45:48 -08:00
parent 775369a8f1
commit 56bb8138bf
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/conversion/scheme.go
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