diff options
author | 2013-04-11 15:37:01 +0200 | |
---|---|---|
committer | 2013-04-11 15:37:01 +0200 | |
commit | 55ca176cd5022d2fc35bc2c06d5f9a764315f238 (patch) | |
tree | 3ee9e0df6dced4282af9116a8c93d888e30b7213 /.emacs.d/snippets/org-mode/codeblock | |
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 '.emacs.d/snippets/org-mode/codeblock')
-rw-r--r-- | .emacs.d/snippets/org-mode/codeblock | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/.emacs.d/snippets/org-mode/codeblock b/.emacs.d/snippets/org-mode/codeblock deleted file mode 100644 index a200b08..0000000 --- a/.emacs.d/snippets/org-mode/codeblock +++ /dev/null @@ -1,7 +0,0 @@ -# -*- mode: snippet -*- -# name: codeblock -# key: code -# -- -#+begin_src $1 - $0 -#+end_src
\ No newline at end of file |