resolve conflict

mine
derailed 2020-06-03 15:00:02 -06:00
commit c0786c2016
2 changed files with 9 additions and 3 deletions

View File

@ -57,6 +57,12 @@ K9s is available on Linux, macOS and Windows platforms.
pacman -S k9s
```
* On OpenSUSE Linux distribution
```shell
zypper install k9s
```
* Via [Scoop](https://scoop.sh) for Windows
```shell
@ -386,12 +392,12 @@ K9s does provide additional environment variables for you to customize your plug
### Example
This defines a plugin for viewing logs on a selected pod using `ctrl-l` for shorcut.
This defines a plugin for viewing logs on a selected pod using `ctrl-l` for shortcut.
```yaml
# $HOME/.k9s/plugin.yml
plugin:
# Defines a plugin to provide a `ctrl-l` shorcut to tail the logs while in pod view.
# Defines a plugin to provide a `ctrl-l` shortcut to tail the logs while in pod view.
fred:
shortCut: Ctrl-L
confirm: false

View File

@ -23,7 +23,7 @@ k9s:
modifyColor: greenyellow
addColor: white
errorColor: orangered
pendingColor: orangered
pendingColor: darkorange
highlightcolor: aqua
killColor: mediumpurple
completedColor: gray