Fix merge conflicts
This commit is contained in:
commit
06281daed8
6 changed files with 66 additions and 27 deletions
|
@ -75,10 +75,10 @@ Enable/Disable GTK2 theme/icons output
|
|||
Enable/Disable gtk3 theme/icons output
|
||||
.TP
|
||||
.B \--shell_path 'on/off'
|
||||
Enable/Disable showing \$SHELL path
|
||||
Enable/Disable showing $SHELL path
|
||||
.TP
|
||||
.B \--shell_version 'on/off'
|
||||
Enable/Disable showing \$SHELL version
|
||||
Enable/Disable showing $SHELL version
|
||||
.TP
|
||||
.B \--battery_num 'num'
|
||||
Which battery to display, default value is 'all'
|
||||
|
@ -230,6 +230,9 @@ Possible values: small, normal
|
|||
.TP
|
||||
.B \--ascii_bold 'on/off'
|
||||
Whether or not to bold the ascii logo.
|
||||
.TP
|
||||
.B \--logo | -L
|
||||
Hide the info text and only show the ascii logo.
|
||||
|
||||
.SH SCREENSHOT
|
||||
.TP
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue