diff options
author | 2013-04-11 15:37:01 +0200 | |
---|---|---|
committer | 2013-04-11 15:37:01 +0200 | |
commit | 55ca176cd5022d2fc35bc2c06d5f9a764315f238 (patch) | |
tree | 3ee9e0df6dced4282af9116a8c93d888e30b7213 /.conkerorrc/styles/.gitignore | |
parent | caf0ec0fb16b3f911d5d596766ee3048fe07fa66 (diff) | |
parent | 9ab70194a65f1d7ab726aaacdb43a58a02a048b6 (diff) | |
download | dotfiles-55ca176cd5022d2fc35bc2c06d5f9a764315f238.tar.gz dotfiles-55ca176cd5022d2fc35bc2c06d5f9a764315f238.zip |
Merge remote-tracking branch 'ryuslash/drd' into phoenix
Conflicts:
.config/herbstluftwm/autostart
.emacs.d/init.el
.xinitrc
.zprofile
Makefile
xmonad/xmonad.hs
Diffstat (limited to '.conkerorrc/styles/.gitignore')
-rw-r--r-- | .conkerorrc/styles/.gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.conkerorrc/styles/.gitignore b/.conkerorrc/styles/.gitignore new file mode 100644 index 0000000..b3a5267 --- /dev/null +++ b/.conkerorrc/styles/.gitignore @@ -0,0 +1 @@ +*.css |