Fix merge conflicts
This commit is contained in:
commit
6dcb4e2c38
2 changed files with 351 additions and 347 deletions
4
1.8.md
4
1.8.md
|
@ -18,6 +18,10 @@
|
||||||
- Fix issues with `bc` and the scale option. **[@maddcoder](https://github.com/maddcoder)**
|
- Fix issues with `bc` and the scale option. **[@maddcoder](https://github.com/maddcoder)**
|
||||||
- Added `--version` to print the neofetch version.
|
- Added `--version` to print the neofetch version.
|
||||||
- The title at the top is now much more colorful.
|
- The title at the top is now much more colorful.
|
||||||
|
- Supress `xprop` errors since it's now an optional dependency.
|
||||||
|
- Fix lint errors.
|
||||||
|
- Remove all instances of `! -z` since they're pointless.
|
||||||
|
- Quote all variable/command substitutions.
|
||||||
|
|
||||||
|
|
||||||
### OS
|
### OS
|
||||||
|
|
Loading…
Reference in a new issue