fixed merge conflict

This commit is contained in:
Andrew Titmuss 2016-03-11 20:58:46 +11:00
parent 75a5f3f41a
commit 041b3af18c

4
1.5.md
View file

@ -11,10 +11,6 @@
**Disk Usage**<br \>
- Only display usage of local disks.
**GPU**</br>
- Add `tiny` option to shorten output of GPU even further.
- Removes words 'Graphics', 'GeForce' and 'Radeon'
### Ascii
- Kaos: Update ascii logo to the new logo.