jayjay
/
k9s
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

resolve conflict with feelings

mine
derailed 2019-05-09 09:39:05 -06:00
parent 1d85bd7993
commit acea4753fc
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
internal/config/ns.go
View File

@ -33,12 +33,7 @@ func (n *Namespace) Validate(c Connection, ks KubeSettings) {
}
nn := ks.NamespaceNames(nns)
if !n.isAllNamespace() && !InList(nn, n.Active) {
<<<<<<< HEAD
log.Error().Msgf("[Config] Validation error active namespace `%s does not exists", n.Active)
=======
log.Error().Msgf("[Config] Validation error active namespace `%s` does not exist", n.Active)
panic(fmt.Errorf("Invalid namespace. The provided namespace `%s` does not exist", n.Active))
>>>>>>> 6be8a58784ba218b22c236be8e5d95d14ac72c03
}
for _, ns := range n.Favorites {