diff options
| author |  Tom Willemsen | 2013-01-04 00:06:15 +0100 |
|---|---|---|
| committer | Tom Willemsen | 2013-01-04 00:06:15 +0100 |
| commit | 12fbc83cc7637548bcefaed1d0b7aea81064c67f (patch) | |
| tree | 7cf66d3804a87e9154479d6d00f72d17002a14bf /.emacs.d/.gitignore | |
| parent | ef288f8ad6c5fe22161fd55d69792e5d0f340b01 (diff) | |
| parent | 1be69078ad8c1af62de79b80345a72d2b8490b04 (diff) | |
| download | dotfiles-12fbc83cc7637548bcefaed1d0b7aea81064c67f.tar.gz dotfiles-12fbc83cc7637548bcefaed1d0b7aea81064c67f.zip | |
Merge remote-tracking branch 'origin/master' into phoenix
Conflicts:
.emacs.d/init.el
Diffstat (limited to '.emacs.d/.gitignore')
| -rw-r--r-- | .emacs.d/.gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.emacs.d/.gitignore b/.emacs.d/.gitignore index 2fa1670..0b490df 100644 --- a/.emacs.d/.gitignore +++ b/.emacs.d/.gitignore @@ -13,3 +13,5 @@ templates/ rinit.* !rinit.org history +init2.el +*.html |