diff options
| author |  Tom Willemsen | 2012-12-05 00:44:09 +0100 |
|---|---|---|
| committer | Tom Willemsen | 2012-12-05 00:44:09 +0100 |
| commit | 6278e2e634b05027d31220afd328a9f7fe77c6f1 (patch) | |
| tree | 3dbec6a3880ca980694def0d737a477b68254691 /.ssh/.gitignore | |
| parent | fa717d86a07d009ab324a40cd8dbf539e61a9da3 (diff) | |
| parent | 15adc911da3f5b527c74b6bb67d677898d6a173e (diff) | |
| download | dotfiles-6278e2e634b05027d31220afd328a9f7fe77c6f1.tar.gz dotfiles-6278e2e634b05027d31220afd328a9f7fe77c6f1.zip | |
Merge remote-tracking branch 'origin/master' into phoenix
Conflicts:
.emacs.d/site-lisp/oni.el
Diffstat (limited to '.ssh/.gitignore')
| -rw-r--r-- | .ssh/.gitignore | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/.ssh/.gitignore b/.ssh/.gitignore index f6b1e46..e69de29 100644 --- a/.ssh/.gitignore +++ b/.ssh/.gitignore @@ -1,4 +0,0 @@ -# -*- eval: (git-auto-commit-mode 1) -*- -* -!config -!.gitignore |