aboutsummaryrefslogtreecommitdiff
path: root/.vimrc
diff options
context:
space:
mode:
authorCharles Cabergs <me@cacharle.xyz>2021-02-05 13:44:12 +0100
committerCharles Cabergs <me@cacharle.xyz>2021-02-05 13:44:12 +0100
commit5def57e9bcb1372f4659e8f98b38dd54a2b9aebc (patch)
tree5beb11d54c5902c084be8087befaf2ae8671a9d2 /.vimrc
parentaf9a66444352c4d46c866638d9875a8e691621da (diff)
parentdcc88d3cf5b9e80d8255c268d873465472e0a876 (diff)
downloaddotfiles-5def57e9bcb1372f4659e8f98b38dd54a2b9aebc.tar.gz
dotfiles-5def57e9bcb1372f4659e8f98b38dd54a2b9aebc.tar.bz2
dotfiles-5def57e9bcb1372f4659e8f98b38dd54a2b9aebc.zip
Merge remote-tracking branch 'origin/master' into carbon
Diffstat (limited to '.vimrc')
-rw-r--r--.vimrc2
1 files changed, 1 insertions, 1 deletions
diff --git a/.vimrc b/.vimrc
index 7f59de6..6bbfe7f 100644
--- a/.vimrc
+++ b/.vimrc
@@ -258,7 +258,7 @@ autocmd Filetype vim setlocal foldmethod=marker
autocmd FileType haskell set formatprg=stylish-haskell
-autocmd FileType lisp,html,css setlocal shiftwidth=2
+autocmd FileType lisp,html,css,htmldjango setlocal shiftwidth=2
" }}}
""""""""""""