Fix merge conflicts

This commit is contained in:
Dylan Araps 2016-10-04 08:39:00 +11:00
commit 06281daed8
6 changed files with 66 additions and 27 deletions

View file

@ -454,6 +454,7 @@ alias neofetch2="neofetch \
--ascii_logo_size Size of ascii logo.
Supported distros: Arch, Gentoo, Crux, OpenBSD.
--ascii_bold on/off Whether or not to bold the ascii logo.
--logo | -L Hide the info text and only show the ascii logo.
Screenshot:
--scrot /path/to/img Take a screenshot, if path is left empty the screen-