diff options
| author | Julian <julianteule@gmail.com> | 2017-02-08 22:20:47 +0100 |
|---|---|---|
| committer | Julian <julianteule@gmail.com> | 2017-02-08 22:20:47 +0100 |
| commit | ecf4878084e1d2fe352e923d4f4f534dcde37869 (patch) | |
| tree | e84442abf973d47db64f86ae0db84bdb5ae13919 /.spacemacs | |
| parent | 4bbbe4724c5260ce6e0e9001aeca7c59236dce3a (diff) | |
| parent | 82ec37bdf8307b14e31a52d57b74b3471b1367ad (diff) | |
Removed irritation error from conky, and fixed merge conflicts
Diffstat (limited to '.spacemacs')
| -rw-r--r-- | .spacemacs | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -31,6 +31,7 @@ values." ;; List of configuration layers to load. dotspacemacs-configuration-layers '( + python markdown html javascript |