diff options
author | 2012-09-16 02:07:48 +0200 | |
---|---|---|
committer | 2012-09-16 02:07:48 +0200 | |
commit | c4ea2643f6cbac10d5b7300e13325c59eb23c5d8 (patch) | |
tree | 3556421a5bc83722d2d9f382a11ab98adb972170 /.conkerorrc/theme.js | |
parent | 72d124100d3fc4fb7ee9ada43385867b0c171a4d (diff) | |
parent | bbc17210a1d3b0c69c36207891d9fb18fd8759f9 (diff) | |
download | dotfiles-c4ea2643f6cbac10d5b7300e13325c59eb23c5d8.tar.gz dotfiles-c4ea2643f6cbac10d5b7300e13325c59eb23c5d8.zip |
Merge remote-tracking branch 'origin/master' into phoenix
Conflicts:
.config/herbstluftwm/autostart
.config/herbstluftwm/panel.sh
Diffstat (limited to '.conkerorrc/theme.js')
-rw-r--r-- | .conkerorrc/theme.js | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/.conkerorrc/theme.js b/.conkerorrc/theme.js deleted file mode 100644 index b298459..0000000 --- a/.conkerorrc/theme.js +++ /dev/null @@ -1,2 +0,0 @@ -theme_load_paths.push("/home/slash/.conkerorrc/themes/"); -theme_load("naquadah"); |