Fix merge conflicts

2016-06-12 16:40:42 +10:00 · 2016-06-12 16:40:42 +10:00 · 6dcb4e2c38
commit 6dcb4e2c38
parent ba78e2c888 23f429dc84
2 changed files with 351 additions and 347 deletions
--- a/1.8.md
+++ b/1.8.md
@ -18,6 +18,10 @@
 - Fix issues with `bc` and the scale option. **[@maddcoder](https://github.com/maddcoder)**
 - Added `--version` to print the neofetch version.
 - 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
--- a/694
+++ b/694