diff options
| author |  Tom Willemsen | 2012-10-24 01:36:38 +0200 |
|---|---|---|
| committer | Tom Willemsen | 2012-10-24 01:36:38 +0200 |
| commit | d6be1ae80fb59495c6bb72b5b6248b5c9a08b4c7 (patch) | |
| tree | 71f06d73cb4139e6a8c8aff91e229a9ff4d58b35 /.xbindkeysrc.scm | |
| parent | ab3e4c680e329db4c01e6d029874124011328ba1 (diff) | |
| parent | 31d3b87a976a229f444251b871c32dd914330044 (diff) | |
| download | dotfiles-d6be1ae80fb59495c6bb72b5b6248b5c9a08b4c7.tar.gz dotfiles-d6be1ae80fb59495c6bb72b5b6248b5c9a08b4c7.zip | |
Merge remote-tracking branch 'origin/master' into phoenix
Conflicts:
.emacs.d/site-lisp/oni.el
.xinitrc
.zprofile
Diffstat (limited to '.xbindkeysrc.scm')
| -rw-r--r-- | .xbindkeysrc.scm | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/.xbindkeysrc.scm b/.xbindkeysrc.scm index 16fcf09..fcfd33e 100644 --- a/.xbindkeysrc.scm +++ b/.xbindkeysrc.scm @@ -226,8 +226,3 @@ ;;;_ Main (first-binding) - -;;;_ Local Variables -;; Local Variables: -;; eval: (git-auto-commit-mode 1) -;; End: |